diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-06-18 14:18:50 +0300 |
| commit | 8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch) | |
| tree | a77e7fe7a93de11213032ed4ab1f33a3db51b738 /app/assets/javascripts/set_status_modal | |
| parent | 00b35af3db1abfe813a778f643dad221aad51fca (diff) | |
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'app/assets/javascripts/set_status_modal')
| -rw-r--r-- | app/assets/javascripts/set_status_modal/set_status_modal_wrapper.vue | 3 |
1 files changed, 2 insertions, 1 deletions
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 2757d64bd7d..fd1f9eae152 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 @@ -82,7 +82,8 @@ export default { }) .catch(() => createFlash(__('Failed to load emoji list.'))); }, - showEmojiMenu() { + showEmojiMenu(e) { + e.stopPropagation(); this.isEmojiMenuVisible = true; this.emojiMenu.showEmojiMenu($(this.$refs.toggleEmojiMenuButton)); }, |