Merge pull request #2630 from szafran89/feature/bus-removal

Event bus import removal
vuestorefront · Apr 1, 2019 · 8b3a1c5 · 8b3a1c5
2 parents 6519c14 + 3c592c5
commit 8b3a1c5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,6 +20,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Improved visibility of product SKU in wishlist  - @PanMisza (#2606)
 - Instant focus to search input field after click on search icon in navbar - @ca1zr (#2608)
 - Added support for the newest node version - @gdomiciano (#2669)
+- Used `$bus` plugin instead of EventBus import - @szafran89 (#2630)
 
 ## [1.9.0-rc.2] - UNRELEASED
 

diff --git a/core/pages/Category.js b/core/pages/Category.js
@@ -249,7 +249,7 @@ export default {
             })
           }
           this.$store.dispatch('category/products', this.getCurrentCategoryProductQuery)
-          EventBus.$emitFilter('category-after-load', { store: this.$store, route: route })
+          this.$bus.$emitFilter('category-after-load', { store: this.$store, route: route })
         }
       }).catch(err => {
         if (err.message.indexOf('query returned empty result') > 0) {

diff --git a/core/pages/Product.js b/core/pages/Product.js
@@ -180,7 +180,7 @@ export default {
       this.$forceUpdate()
     },
     onAfterFilterChanged (filterOption) {
-      EventBus.$emit('product-before-configure', { filterOption: filterOption, configuration: this.configuration })
+      this.$bus.$emit('product-before-configure', { filterOption: filterOption, configuration: this.configuration })
       const prevOption = this.configuration[filterOption.attribute_code]
       this.configuration[filterOption.attribute_code] = filterOption
       this.$forceUpdate() // this is to update the available options regarding current selection
@@ -213,7 +213,7 @@ export default {
     onUserPricesRefreshed () {
       if (this.$route.params.parentSku) {
         this.$store.dispatch('product/reset')
-        EventBus.$emit('product-before-load', { store: this.$store, route: this.$route })
+        this.$bus.$emit('product-before-load', { store: this.$store, route: this.$route })
         this.$store.dispatch('product/single', {
           options: {
             sku: this.$route.params.parentSku,

diff --git a/src/themes/default/layouts/Default.vue b/src/themes/default/layouts/Default.vue
@@ -39,7 +39,6 @@
 
 <script>
 import { mapState } from 'vuex'
-import EventBus from '@vue-storefront/core/compatibility/plugins/event-bus'
 import AsyncSidebar from 'theme/components/theme/blocks/AsyncSidebar/AsyncSidebar.vue'
 import MainHeader from 'theme/components/core/blocks/Header/Header.vue'
 import MainFooter from 'theme/components/core/blocks/Footer/Footer.vue'
@@ -83,7 +82,7 @@ export default {
     onOrderConfirmation (payload) {
       this.loadOrderConfirmation = true
       this.ordersData = payload
-      EventBus.$emit('modal-show', 'modal-order-confirmation')
+      this.$bus.$emit('modal-show', 'modal-order-confirmation')
     },
     fetchMenuData () {
       return this.$store.dispatch('category/list', { level: this.$store.state.config.entities.category.categoriesDynamicPrefetch && this.$store.state.config.entities.category.categoriesDynamicPrefetchLevel ? this.$store.state.config.entities.category.categoriesDynamicPrefetchLevel : null, includeFields: this.$store.state.config.entities.optimize && isServer ? this.$store.state.config.entities.category.includeFields : null, skipCache: isServer })
@@ -102,10 +101,10 @@ export default {
     this.$router.afterEach((to, from) => {
       this.$Progress.finish()
     })
-    EventBus.$on('offline-order-confirmation', this.onOrderConfirmation)
+    this.$bus.$on('offline-order-confirmation', this.onOrderConfirmation)
   },
   beforeDestroy () {
-    EventBus.$off('offline-order-confirmation', this.onOrderConfirmation)
+    this.$bus.$off('offline-order-confirmation', this.onOrderConfirmation)
   },
   metaInfo: Head,
   components: {