diff --git a/package.json b/package.json index 8582533..475b4a1 100644 --- a/package.json +++ b/package.json @@ -74,10 +74,10 @@ "sinon-chai": "^2.8.0", "three": "^0.86.0", "url-loader": "^0.5.8", - "vue": "^2.3.3", + "vue": "^2.4.4", "vue-loader": "^12.1.0", "vue-style-loader": "^3.0.1", - "vue-template-compiler": "^2.3.3", + "vue-template-compiler": "^2.4.4", "webpack": "^2.6.1", "webpack-bundle-analyzer": "^2.2.1", "webpack-dev-middleware": "^1.10.0", diff --git a/src/components/AudioListener.vue b/src/components/AudioListener.vue index 1b67972..cd4bd5b 100644 --- a/src/components/AudioListener.vue +++ b/src/components/AudioListener.vue @@ -10,11 +10,7 @@ export default { name: 'AudioListener', mixins: [Object3D], components: { Object3D }, - - inject: [ - ...Object3D.inject, - 'global' - ], + inject: ['global'], data () { let listener = new AudioListener() diff --git a/src/components/Camera.vue b/src/components/Camera.vue index fea5ccf..8b274ed 100644 --- a/src/components/Camera.vue +++ b/src/components/Camera.vue @@ -5,12 +5,7 @@ import Object3D from './Object3D' export default { name: 'Camera', mixins: [Object3D], - - inject: [ - ...Object3D.inject, - 'global' - ], - + inject: ['global'], props: { obj: { type: Object } }, diff --git a/src/components/Object3D.vue b/src/components/Object3D.vue index 907f4e6..c887d22 100644 --- a/src/components/Object3D.vue +++ b/src/components/Object3D.vue @@ -11,7 +11,6 @@ export default { parentObj: this.curObj } }, - inject: ['parentObj'], props: { diff --git a/src/components/OrbitControls.vue b/src/components/OrbitControls.vue index 89c8b45..a986aab 100644 --- a/src/components/OrbitControls.vue +++ b/src/components/OrbitControls.vue @@ -14,11 +14,7 @@ export default { name: 'OrbitControls', mixins: [Object3D], components: { Object3D }, - - inject: [ - ...Object3D.inject, - 'global' - ], + inject: ['global'], data () { return { diff --git a/src/components/PositionalAudio.vue b/src/components/PositionalAudio.vue index 562d8c0..e3bd1e3 100644 --- a/src/components/PositionalAudio.vue +++ b/src/components/PositionalAudio.vue @@ -12,12 +12,7 @@ export default { name: 'PositionalAudio', mixins: [Object3D], components: { Object3D }, - - inject: [ - ...Object3D.inject, - 'global' - ], - + inject: ['global'], props: { url: String }, data () { diff --git a/src/components/Scene.vue b/src/components/Scene.vue index ad919fa..4884a36 100644 --- a/src/components/Scene.vue +++ b/src/components/Scene.vue @@ -7,12 +7,7 @@ import Object3D from './Object3D' export default { name: 'Scene', mixins: [Object3D], - - inject: [ - ...Object3D.inject, - 'global' - ], - + inject: ['global'], props: { obj: { type: Object } }, diff --git a/src/physics/MassObject.vue b/src/physics/MassObject.vue index 7764f22..3ded3e9 100644 --- a/src/physics/MassObject.vue +++ b/src/physics/MassObject.vue @@ -6,12 +6,6 @@ import Vue from 'vue' export default { name: 'MassObject', mixins: [MovementObject], - - // Vue provide/inject not inherited?? - // inject: [ - // ...MovementObject.inject - // ], - props: { f: Object, m: { type: Number, default: 1 } diff --git a/src/physics/MovementObject.vue b/src/physics/MovementObject.vue index ada27aa..dc57425 100644 --- a/src/physics/MovementObject.vue +++ b/src/physics/MovementObject.vue @@ -11,11 +11,7 @@ export default { name: 'MovementObject', mixins: [Object3D], components: { Object3D }, - - inject: [ - ...Object3D.inject, - 'movemVms' - ], + inject: ['movemVms'], props: { a: Object,