Skip to content

Commit a858651

Browse files
author
Fritz Lin
committed
chore(inject): remove maully inject inherience with vue update
vuejs/vue#6436
1 parent e6777ba commit a858651

9 files changed

+8
-42
lines changed

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@
7474
"sinon-chai": "^2.8.0",
7575
"three": "^0.86.0",
7676
"url-loader": "^0.5.8",
77-
"vue": "^2.3.3",
77+
"vue": "^2.4.4",
7878
"vue-loader": "^12.1.0",
7979
"vue-style-loader": "^3.0.1",
80-
"vue-template-compiler": "^2.3.3",
80+
"vue-template-compiler": "^2.4.4",
8181
"webpack": "^2.6.1",
8282
"webpack-bundle-analyzer": "^2.2.1",
8383
"webpack-dev-middleware": "^1.10.0",

src/components/AudioListener.vue

+1-5
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,7 @@ export default {
1010
name: 'AudioListener',
1111
mixins: [Object3D],
1212
components: { Object3D },
13-
14-
inject: [
15-
...Object3D.inject,
16-
'global'
17-
],
13+
inject: ['global'],
1814
1915
data () {
2016
let listener = new AudioListener()

src/components/Camera.vue

+1-6
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,7 @@ import Object3D from './Object3D'
55
export default {
66
name: 'Camera',
77
mixins: [Object3D],
8-
9-
inject: [
10-
...Object3D.inject,
11-
'global'
12-
],
13-
8+
inject: ['global'],
149
props: {
1510
obj: { type: Object }
1611
},

src/components/Object3D.vue

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ export default {
1111
parentObj: this.curObj
1212
}
1313
},
14-
1514
inject: ['parentObj'],
1615
1716
props: {

src/components/OrbitControls.vue

+1-5
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,7 @@ export default {
1414
name: 'OrbitControls',
1515
mixins: [Object3D],
1616
components: { Object3D },
17-
18-
inject: [
19-
...Object3D.inject,
20-
'global'
21-
],
17+
inject: ['global'],
2218
2319
data () {
2420
return {

src/components/PositionalAudio.vue

+1-6
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,7 @@ export default {
1212
name: 'PositionalAudio',
1313
mixins: [Object3D],
1414
components: { Object3D },
15-
16-
inject: [
17-
...Object3D.inject,
18-
'global'
19-
],
20-
15+
inject: ['global'],
2116
props: { url: String },
2217
2318
data () {

src/components/Scene.vue

+1-6
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,7 @@ import Object3D from './Object3D'
77
export default {
88
name: 'Scene',
99
mixins: [Object3D],
10-
11-
inject: [
12-
...Object3D.inject,
13-
'global'
14-
],
15-
10+
inject: ['global'],
1611
props: {
1712
obj: { type: Object }
1813
},

src/physics/MassObject.vue

-6
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,6 @@ import Vue from 'vue'
66
export default {
77
name: 'MassObject',
88
mixins: [MovementObject],
9-
10-
// Vue provide/inject not inherited??
11-
// inject: [
12-
// ...MovementObject.inject
13-
// ],
14-
159
props: {
1610
f: Object,
1711
m: { type: Number, default: 1 }

src/physics/MovementObject.vue

+1-5
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,7 @@ export default {
1111
name: 'MovementObject',
1212
mixins: [Object3D],
1313
components: { Object3D },
14-
15-
inject: [
16-
...Object3D.inject,
17-
'movemVms'
18-
],
14+
inject: ['movemVms'],
1915
2016
props: {
2117
a: Object,

0 commit comments

Comments
 (0)