diff options
| author | João Cunha <j.a.cunha@gmail.com> | 2019-02-26 10:33:32 +0000 |
|---|---|---|
| committer | João Cunha <j.a.cunha@gmail.com> | 2019-02-26 10:33:32 +0000 |
| commit | ed7065bbdb6f6fad3cc8fb369267fa811767c8a5 (patch) | |
| tree | b3fda377c51504a6d21da1742cac3de7fd668ef0 /app/assets/javascripts/notes/components/note_actions.vue | |
| parent | 26c7d04cd06d1126e4a4a7a1c9308d12de77172e (diff) | |
| parent | 094d740886eaf62fd219dacd11aa9a966758a962 (diff) | |
| download | gitlab-ce-56937-edit-knative-domain-after-it-has-been-deployed.tar.gz | |
Merge branch 'master' into 56937-edit-knative-domain-after-it-has-been-deployed56937-edit-knative-domain-after-it-has-been-deployed
Diffstat (limited to 'app/assets/javascripts/notes/components/note_actions.vue')
| -rw-r--r-- | app/assets/javascripts/notes/components/note_actions.vue | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/app/assets/javascripts/notes/components/note_actions.vue b/app/assets/javascripts/notes/components/note_actions.vue index 91b9e5de374..de1ea0f58d6 100644 --- a/app/assets/javascripts/notes/components/note_actions.vue +++ b/app/assets/javascripts/notes/components/note_actions.vue @@ -23,11 +23,6 @@ export default { type: [String, Number], required: true, }, - discussionId: { - type: String, - required: false, - default: '', - }, noteUrl: { type: String, required: false, @@ -126,6 +121,11 @@ export default { onResolve() { this.$emit('handleResolve'); }, + closeTooltip() { + this.$nextTick(() => { + this.$root.$emit('bv::hide::tooltip'); + }); + }, }, }; </script> @@ -171,7 +171,7 @@ export default { v-if="showReplyButton" ref="replyButton" class="js-reply-button" - :note-id="discussionId" + @startReplying="$emit('startReplying')" /> <div v-if="canEdit" class="note-actions-item"> <button @@ -202,6 +202,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> |