Commit 8b52503f authored by Phil Hughes's avatar Phil Hughes

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
parent 1bd82e84
<script> <script>
import { mapActions, mapGetters } from 'vuex'; 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 Icon from '~/vue_shared/components/icon.vue';
import Flash from '../../flash'; import Flash from '../../flash';
import { glEmojiTag } from '../../emoji'; import { glEmojiTag } from '../../emoji';
...@@ -10,7 +10,7 @@ export default { ...@@ -10,7 +10,7 @@ export default {
Icon, Icon,
}, },
directives: { directives: {
GlTooltip: GlTooltipDirective, tooltip,
}, },
props: { props: {
awards: { awards: {
...@@ -167,9 +167,11 @@ export default { ...@@ -167,9 +167,11 @@ export default {
<button <button
v-for="(awardList, awardName, index) in groupedAwards" v-for="(awardList, awardName, index) in groupedAwards"
:key="index" :key="index"
v-gl-tooltip.bottom="{ boundary: 'viewport' }" v-tooltip
:class="getAwardClassBindings(awardList)" :class="getAwardClassBindings(awardList)"
:title="awardTitle(awardList)" :title="awardTitle(awardList)"
data-boundary="viewport"
data-placement="bottom"
class="btn award-control" class="btn award-control"
type="button" type="button"
@click="handleAward(awardName);" @click="handleAward(awardName);"
...@@ -179,7 +181,7 @@ export default { ...@@ -179,7 +181,7 @@ export default {
</button> </button>
<div v-if="canAwardEmoji" class="award-menu-holder"> <div v-if="canAwardEmoji" class="award-menu-holder">
<button <button
v-gl-tooltip v-tooltip
:class="{ 'js-user-authored': isAuthoredByMe }" :class="{ 'js-user-authored': isAuthoredByMe }"
class="award-control btn js-add-award" class="award-control btn js-add-award"
title="Add reaction" title="Add reaction"
......
---
title: Fixed double tooltips on note awards buttons
merge_request:
author:
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment