diff options
author | Rémy Coutable <remy@rymai.me> | 2018-05-02 15:32:03 +0000 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-05-02 15:32:03 +0000 |
commit | 1f08fab43fbc13e01e5ec7ca3aec5dbd6762eb26 (patch) | |
tree | f60a06cfc8adecf858a5b9e0d44a5021810297ff /app/assets/javascripts/sidebar/components | |
parent | 6187dc24678a1bda193c02c51e1197adb9551efa (diff) | |
download | gitlab-ce-1f08fab43fbc13e01e5ec7ca3aec5dbd6762eb26.tar.gz |
Revert "Merge branch '5480-sidebar-subscription-event-handling' into 'master'"
This reverts merge request !18682
Diffstat (limited to 'app/assets/javascripts/sidebar/components')
-rw-r--r-- | app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions.vue | 8 | ||||
-rw-r--r-- | app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions.vue b/app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions.vue index 385717e7c1e..3e8cc7a6630 100644 --- a/app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions.vue +++ b/app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions.vue @@ -1,5 +1,6 @@ <script> import Store from '../../stores/sidebar_store'; +import eventHub from '../../event_hub'; import Flash from '../../../flash'; import { __ } from '../../../locale'; import subscriptions from './subscriptions.vue'; @@ -19,6 +20,12 @@ export default { store: new Store(), }; }, + created() { + eventHub.$on('toggleSubscription', this.onToggleSubscription); + }, + beforeDestroy() { + eventHub.$off('toggleSubscription', this.onToggleSubscription); + }, methods: { onToggleSubscription() { this.mediator.toggleSubscription() @@ -35,7 +42,6 @@ export default { <subscriptions :loading="store.isFetching.subscriptions" :subscribed="store.subscribed" - @toggleSubscription="onToggleSubscription" /> </div> </template> diff --git a/app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue b/app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue index 486aff8a938..d69d100a26c 100644 --- a/app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue +++ b/app/assets/javascripts/sidebar/components/subscriptions/subscriptions.vue @@ -3,6 +3,7 @@ import icon from '~/vue_shared/components/icon.vue'; import toggleButton from '~/vue_shared/components/toggle_button.vue'; import tooltip from '~/vue_shared/directives/tooltip'; + import eventHub from '../../event_hub'; const ICON_ON = 'notifications'; const ICON_OFF = 'notifications-off'; @@ -47,7 +48,7 @@ }, methods: { toggleSubscription() { - this.$emit('toggleSubscription', this.id); + eventHub.$emit('toggleSubscription', this.id); }, }, }; |