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
This commit is contained in:
parent
1bd82e84e3
commit
8b52503f45
2 changed files with 11 additions and 4 deletions
|
@ -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"
|
||||
|
|
|
@ -0,0 +1,5 @@
|
|||
---
|
||||
title: Fixed double tooltips on note awards buttons
|
||||
merge_request:
|
||||
author:
|
||||
type: fixed
|
Loading…
Reference in a new issue