From 1a8b25066c89c9dac986e8029d8fa82243f0e22f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Szafra=C5=84ski?= <pawel.szafranski@snow.dog>
Date: Thu, 21 Mar 2019 19:46:29 +0100
Subject: [PATCH 1/4] Event bus import removal

---
 src/themes/default/layouts/Default.vue | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/themes/default/layouts/Default.vue b/src/themes/default/layouts/Default.vue
index 76f65e659f..6c25619cfc 100644
--- 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'
@@ -82,7 +81,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', { includeFields: this.$store.state.config.entities.optimize ? this.$store.state.config.entities.category.includeFields : null })
@@ -101,10 +100,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: {

From 1a357a3b1f217a4b4f2c7a8feec6d860bb9032c8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Szafra=C5=84ski?= <pawel.szafranski@snow.dog>
Date: Fri, 22 Mar 2019 00:22:00 +0100
Subject: [PATCH 2/4] Updated changelog

---
 CHANGELOG.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 053b58f2a7..55705bd3f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,14 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [1.10.0-rc.1] - UNRELEASED
 
 ### Added
-- 
+-
 
 ### Fixed
-- 
+-
 
 ### Changed / Improved
 - Improved ProductGalleryCarousel component to handle nonnumeric options id’s - @danieldomurad (#2586)
 - Number of displayed products is now visible on PLP on desktop - @awierzbiak (#2504)
+- Used `$bus` plugin instead of EventBus import - @szafran89
 
 ## [1.9.0-rc.1] - 2019.03.07
 

From 575ecbaa9e96037664115a687838949c81ff7717 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Szafra=C5=84ski?= <pawel.szafranski@snow.dog>
Date: Mon, 1 Apr 2019 15:12:41 +0200
Subject: [PATCH 3/4] Replacement EventBus with $bus plugin - core category,
 core product

---
 core/pages/Category.js | 2 +-
 core/pages/Product.js  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/pages/Category.js b/core/pages/Category.js
index 10e9213c73..f45d622c94 100644
--- a/core/pages/Category.js
+++ b/core/pages/Category.js
@@ -251,7 +251,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
index eb57279499..42811e993d 100644
--- 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,

From 3c592c5d52a8549c9cc25de5faf911f3364c5ad9 Mon Sep 17 00:00:00 2001
From: Patryk Tomczyk <13100280+patzick@users.noreply.github.com>
Date: Mon, 1 Apr 2019 15:50:05 +0200
Subject: [PATCH 4/4] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ec72ef9d48..089bb89815 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,7 +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
+- Used `$bus` plugin instead of EventBus import - @szafran89 (#2630)
 
 ## [1.9.0-rc.2] - UNRELEASED