diff options
author | Phil Hughes <me@iamphill.com> | 2018-05-02 16:16:54 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-05-02 16:16:54 +0000 |
commit | c7c9f38d01938963a8cdf7f5a3bd12ea53e22e59 (patch) | |
tree | 3e0d81c5ad5bdf00c5c32e8b35c6952d55f69fa6 | |
parent | 66ba430d7fe53d5e953f49ba1fb1be218e70786e (diff) | |
parent | 1f08fab43fbc13e01e5ec7ca3aec5dbd6762eb26 (diff) | |
download | gitlab-ce-c7c9f38d01938963a8cdf7f5a3bd12ea53e22e59.tar.gz |
Merge branch 'revert-75f6e91f' into 'master'
Revert "Merge branch '5480-sidebar-subscription-event-handling' into 'master'"
Closes #45979
See merge request gitlab-org/gitlab-ce!18692
4 files changed, 11 insertions, 11 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); }, }, }; diff --git a/spec/javascripts/sidebar/sidebar_subscriptions_spec.js b/spec/javascripts/sidebar/sidebar_subscriptions_spec.js index 9e437084224..56a2543660b 100644 --- a/spec/javascripts/sidebar/sidebar_subscriptions_spec.js +++ b/spec/javascripts/sidebar/sidebar_subscriptions_spec.js @@ -3,6 +3,7 @@ import sidebarSubscriptions from '~/sidebar/components/subscriptions/sidebar_sub import SidebarMediator from '~/sidebar/sidebar_mediator'; import SidebarService from '~/sidebar/services/sidebar_service'; import SidebarStore from '~/sidebar/stores/sidebar_store'; +import eventHub from '~/sidebar/event_hub'; import mountComponent from 'spec/helpers/vue_mount_component_helper'; import Mock from './mock_data'; @@ -31,7 +32,7 @@ describe('Sidebar Subscriptions', function () { mediator, }); - vm.onToggleSubscription(); + eventHub.$emit('toggleSubscription'); expect(mediator.toggleSubscription).toHaveBeenCalled(); }); diff --git a/spec/javascripts/sidebar/subscriptions_spec.js b/spec/javascripts/sidebar/subscriptions_spec.js index 11ff126dfb5..aee8f0acbb9 100644 --- a/spec/javascripts/sidebar/subscriptions_spec.js +++ b/spec/javascripts/sidebar/subscriptions_spec.js @@ -39,12 +39,4 @@ describe('Subscriptions', function () { expect(vm.$refs.toggleButton.$el.querySelector('.project-feature-toggle')).toHaveClass('is-checked'); }); - - it('toggleSubscription method emits `toggleSubscription` event on component', () => { - vm = mountComponent(Subscriptions, { subscribed: true }); - spyOn(vm, '$emit'); - - vm.toggleSubscription(); - expect(vm.$emit).toHaveBeenCalledWith('toggleSubscription', jasmine.any(Object)); - }); }); |