fix: Revert isolate internal eventbus. Use relatively unique event na…

…me to isolate from user events.
stasson · Apr 25, 2018 · 97eceaf · 97eceaf
1 parent aea2733
commit 97eceaf
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 57 deletions.
diff --git a/components/common/event-bus.js b/components/common/event-bus.js
diff --git a/components/common/index.js b/components/common/index.js
diff --git a/components/common/mdc-common.js b/components/common/mdc-common.js
diff --git a/components/common/unique-id.js b/components/common/unique-id.js
diff --git a/components/drawer/mdc-drawer.vue b/components/drawer/mdc-drawer.vue
@@ -13,7 +13,6 @@
 import mdcPermanentDrawer from './mdc-permanent-drawer.vue';
 import mdcPersistentDrawer from './mdc-persistent-drawer.vue';
 import mdcTemporaryDrawer from './mdc-temporary-drawer.vue';
-import { eventBus } from '../common';
 
 const media = new class {
   get small() {
@@ -119,7 +118,7 @@ export default {
     },
     onChange(event) {
       this.$emit('change', event);
-      eventBus.$emit('mdc:layout');
+      this.$root.$emit('_vma_:layout');
     },
     openDrawer() {
       this.open_ = true;

diff --git a/components/index.js b/components/index.js
@@ -1,7 +1,6 @@
 //
 // vue PlugIn
 //
-import VueMDCCommon from './common';
 import VueMDCButton from './button';
 import VueMDCCard from './card';
 import VueMDCCheckbox from './checkbox';
@@ -34,7 +33,6 @@ import VueMDCTypography from './typography';
 export default {
   version: '__VERSION__',
   install(vm) {
-    vm.use(VueMDCCommon);
     vm.use(VueMDCButton);
     vm.use(VueMDCCard);
     vm.use(VueMDCCheckbox);

diff --git a/components/slider/mdc-slider.vue b/components/slider/mdc-slider.vue
@@ -25,7 +25,6 @@
 <script>
 import MDCSliderFoundation from '@material/slider/foundation';
 import { DispatchFocusMixin } from '../base';
-import { eventBus } from '../common';
 
 export default {
   name: 'mdc-slider',
@@ -171,15 +170,15 @@ export default {
       this.foundation.setupTrackMarker();
     }
 
-    eventBus.$on('mdc:layout', this.layout);
+    this.$root.$on('_vma_:layout', this.layout);
 
     if (this.layoutOn) {
       this.layoutOnEventSource = this.layoutOnSource || this.$root;
       this.layoutOnEventSource.$on(this.layoutOn, this.layout);
     }
   },
   beforeDestroy() {
-    eventBus.$off('mdc:layout', this.layout);
+    this.$root.$off('_vma_:layout', this.layout);
     if (this.layoutOnEventSource) {
       this.layoutOnEventSource.$off(this.layoutOn, this.layout);
     }