Skip to content

Commit

Permalink
chore(inject): remove manually inject inherience with vue update
Browse files Browse the repository at this point in the history
  • Loading branch information
Fritz Lin committed Oct 10, 2017
1 parent e6777ba commit 2cc4bb1
Show file tree
Hide file tree
Showing 9 changed files with 8 additions and 42 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 1 addition & 5 deletions src/components/AudioListener.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,7 @@ export default {
name: 'AudioListener',
mixins: [Object3D],
components: { Object3D },
inject: [
...Object3D.inject,
'global'
],
inject: ['global'],
data () {
let listener = new AudioListener()
Expand Down
7 changes: 1 addition & 6 deletions src/components/Camera.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,7 @@ import Object3D from './Object3D'
export default {
name: 'Camera',
mixins: [Object3D],
inject: [
...Object3D.inject,
'global'
],
inject: ['global'],
props: {
obj: { type: Object }
},
Expand Down
1 change: 0 additions & 1 deletion src/components/Object3D.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ export default {
parentObj: this.curObj
}
},
inject: ['parentObj'],
props: {
Expand Down
6 changes: 1 addition & 5 deletions src/components/OrbitControls.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,7 @@ export default {
name: 'OrbitControls',
mixins: [Object3D],
components: { Object3D },
inject: [
...Object3D.inject,
'global'
],
inject: ['global'],
data () {
return {
Expand Down
7 changes: 1 addition & 6 deletions src/components/PositionalAudio.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,7 @@ export default {
name: 'PositionalAudio',
mixins: [Object3D],
components: { Object3D },
inject: [
...Object3D.inject,
'global'
],
inject: ['global'],
props: { url: String },
data () {
Expand Down
7 changes: 1 addition & 6 deletions src/components/Scene.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,7 @@ import Object3D from './Object3D'
export default {
name: 'Scene',
mixins: [Object3D],
inject: [
...Object3D.inject,
'global'
],
inject: ['global'],
props: {
obj: { type: Object }
},
Expand Down
6 changes: 0 additions & 6 deletions src/physics/MassObject.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
6 changes: 1 addition & 5 deletions src/physics/MovementObject.vue
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,7 @@ export default {
name: 'MovementObject',
mixins: [Object3D],
components: { Object3D },
inject: [
...Object3D.inject,
'movemVms'
],
inject: ['movemVms'],
props: {
a: Object,
Expand Down

0 comments on commit 2cc4bb1

Please sign in to comment.