diff options
author | Phil Hughes <me@iamphill.com> | 2019-02-12 11:31:37 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2019-02-12 11:31:37 +0000 |
commit | 3537f12fc811537f49e2d9be5f495bfc9393047c (patch) | |
tree | deeb893cf3c827731656b653465a1c0161dc5ddf /app/assets | |
parent | 52ad7d253c31dc475b89311eca81e0a609056b59 (diff) | |
parent | be485a781d6fde502627f891a1c11e93c9bfbf3c (diff) | |
download | gitlab-ce-3537f12fc811537f49e2d9be5f495bfc9393047c.tar.gz |
Merge branch '55209-tool-tip-hides-menu-item' into 'master'
Resolve "Tool Tip Hides Menu Item"
Closes #55209
See merge request gitlab-org/gitlab-ce!24285
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/notes/components/note_actions.vue | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/javascripts/notes/components/note_actions.vue b/app/assets/javascripts/notes/components/note_actions.vue index 91b9e5de374..969d5b69c25 100644 --- a/app/assets/javascripts/notes/components/note_actions.vue +++ b/app/assets/javascripts/notes/components/note_actions.vue @@ -126,6 +126,11 @@ export default { onResolve() { this.$emit('handleResolve'); }, + closeTooltip() { + this.$nextTick(() => { + this.$root.$emit('bv::hide::tooltip'); + }); + }, }, }; </script> @@ -202,6 +207,7 @@ export default { title="More actions" class="note-action-button more-actions-toggle btn btn-transparent" data-toggle="dropdown" + @click="closeTooltip" > <icon css-classes="icon" name="ellipsis_v" /> </button> |