diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-10 00:08:33 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-10 00:08:33 +0300 |
commit | b296ffa543e23f57fa2692539e6f0028c59e2203 (patch) | |
tree | f5224a37cac088506d1c8fd53925ee1d9fd2a02c /app/assets/javascripts/set_status_modal | |
parent | c172bb9967f280e05bd904188d60a959dff10f00 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/set_status_modal')
3 files changed, 1 insertions, 35 deletions
diff --git a/app/assets/javascripts/set_status_modal/event_hub.js b/app/assets/javascripts/set_status_modal/event_hub.js deleted file mode 100644 index e31806ad199..00000000000 --- a/app/assets/javascripts/set_status_modal/event_hub.js +++ /dev/null @@ -1,3 +0,0 @@ -import createEventHub from '~/helpers/event_hub_factory'; - -export default createEventHub(); diff --git a/app/assets/javascripts/set_status_modal/set_status_modal_trigger.vue b/app/assets/javascripts/set_status_modal/set_status_modal_trigger.vue deleted file mode 100644 index 0e8b6d93f42..00000000000 --- a/app/assets/javascripts/set_status_modal/set_status_modal_trigger.vue +++ /dev/null @@ -1,27 +0,0 @@ -<script> -import { s__ } from '~/locale'; -import eventHub from './event_hub'; - -export default { - props: { - hasStatus: { - type: Boolean, - required: true, - }, - }, - computed: { - buttonText() { - return this.hasStatus ? s__('SetStatusModal|Edit status') : s__('SetStatusModal|Set status'); - }, - }, - methods: { - openModal() { - eventHub.$emit('openModal'); - }, - }, -}; -</script> - -<template> - <button type="button" class="btn menu-item" @click="openModal">{{ buttonText }}</button> -</template> diff --git a/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue b/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue index a841cca8c95..09e893ff285 100644 --- a/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue +++ b/app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue @@ -6,7 +6,6 @@ import { GlModal, GlTooltipDirective, GlIcon } from '@gitlab/ui'; import { deprecatedCreateFlash as createFlash } from '~/flash'; import { __, s__ } from '~/locale'; import Api from '~/api'; -import eventHub from './event_hub'; import EmojiMenuInModal from './emoji_menu_in_modal'; import * as Emoji from '~/emoji'; @@ -48,15 +47,12 @@ export default { }, }, mounted() { - eventHub.$on('openModal', this.openModal); + this.$root.$emit('bv::show::modal', this.modalId); }, beforeDestroy() { this.emojiMenu.destroy(); }, methods: { - openModal() { - this.$root.$emit('bv::show::modal', this.modalId); - }, closeModal() { this.$root.$emit('bv::hide::modal', this.modalId); }, |