Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2019-01-09 12:01:51 +0300
committerPhil Hughes <me@iamphill.com>2019-01-09 12:01:51 +0300
commit8b52503f459c65384daf180ca649e2b53c3d7930 (patch)
treea17eaf3eb183aff483581c4d270975a3056399c4
parent1bd82e84e30ac47fc6dbc73f1e0ae7c988632a01 (diff)
Fixes doubles tooltips on note awards
Reverts the note awards tooltips to use our own tooltip directive. Using the Bootstrap Vue tooltip inteferes with the Bootstrap JS tooltips which gets init'd in another JS file. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/55483
-rw-r--r--app/assets/javascripts/notes/components/note_awards_list.vue10
-rw-r--r--changelogs/unreleased/notes-awards-double-tooltip-fix.yml5
2 files changed, 11 insertions, 4 deletions
diff --git a/app/assets/javascripts/notes/components/note_awards_list.vue b/app/assets/javascripts/notes/components/note_awards_list.vue
index 3d60eb02db8..bde00ea87ff 100644
--- a/app/assets/javascripts/notes/components/note_awards_list.vue
+++ b/app/assets/javascripts/notes/components/note_awards_list.vue
@@ -1,6 +1,6 @@
<script>
import { mapActions, mapGetters } from 'vuex';
-import { GlTooltipDirective } from '@gitlab/ui';
+import tooltip from '~/vue_shared/directives/tooltip';
import Icon from '~/vue_shared/components/icon.vue';
import Flash from '../../flash';
import { glEmojiTag } from '../../emoji';
@@ -10,7 +10,7 @@ export default {
Icon,
},
directives: {
- GlTooltip: GlTooltipDirective,
+ tooltip,
},
props: {
awards: {
@@ -167,9 +167,11 @@ export default {
<button
v-for="(awardList, awardName, index) in groupedAwards"
:key="index"
- v-gl-tooltip.bottom="{ boundary: 'viewport' }"
+ v-tooltip
:class="getAwardClassBindings(awardList)"
:title="awardTitle(awardList)"
+ data-boundary="viewport"
+ data-placement="bottom"
class="btn award-control"
type="button"
@click="handleAward(awardName);"
@@ -179,7 +181,7 @@ export default {
</button>
<div v-if="canAwardEmoji" class="award-menu-holder">
<button
- v-gl-tooltip
+ v-tooltip
:class="{ 'js-user-authored': isAuthoredByMe }"
class="award-control btn js-add-award"
title="Add reaction"
diff --git a/changelogs/unreleased/notes-awards-double-tooltip-fix.yml b/changelogs/unreleased/notes-awards-double-tooltip-fix.yml
new file mode 100644
index 00000000000..23338a60c2a
--- /dev/null
+++ b/changelogs/unreleased/notes-awards-double-tooltip-fix.yml
@@ -0,0 +1,5 @@
+---
+title: Fixed double tooltips on note awards buttons
+merge_request:
+author:
+type: fixed