diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 13:00:54 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-20 13:00:54 +0300 |
commit | 3cccd102ba543e02725d247893729e5c73b38295 (patch) | |
tree | f36a04ec38517f5deaaacb5acc7d949688d1e187 /app/assets/javascripts/vue_shared/components/awards_list.vue | |
parent | 205943281328046ef7b4528031b90fbda70c75ac (diff) |
Add latest changes from gitlab-org/gitlab@14-10-stable-eev14.10.0-rc42
Diffstat (limited to 'app/assets/javascripts/vue_shared/components/awards_list.vue')
-rw-r--r-- | app/assets/javascripts/vue_shared/components/awards_list.vue | 26 |
1 files changed, 5 insertions, 21 deletions
diff --git a/app/assets/javascripts/vue_shared/components/awards_list.vue b/app/assets/javascripts/vue_shared/components/awards_list.vue index 96970f4ce2f..f5d8811e83c 100644 --- a/app/assets/javascripts/vue_shared/components/awards_list.vue +++ b/app/assets/javascripts/vue_shared/components/awards_list.vue @@ -4,7 +4,7 @@ import { groupBy } from 'lodash'; import EmojiPicker from '~/emoji/components/picker.vue'; import { __, sprintf } from '~/locale'; import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; -import { glEmojiTag } from '../../emoji'; +import { glEmojiTag } from '~/emoji'; // Internal constant, specific to this component, used when no `currentUserId` is given const NO_USER_ID = -1; @@ -93,12 +93,14 @@ export default { return awardList.some((award) => award.user.id === this.currentUserId); }, createAwardList(name, list) { + const url = list.length ? list[0].url : null; + return { name, list, title: this.getAwardListTitle(list, name), classes: this.getAwardClassBindings(list), - html: glEmojiTag(name), + html: glEmojiTag(name, { url }), }; }, getAwardListTitle(awardsList, name) { @@ -198,10 +200,10 @@ export default { </gl-button> <div v-if="canAwardEmoji" class="award-menu-holder gl-my-2"> <emoji-picker - v-if="glFeatures.improvedEmojiPicker" v-gl-tooltip.viewport :title="__('Add reaction')" :toggle-class="['add-reaction-button btn-icon gl-relative!', { 'is-active': isMenuOpen }]" + data-testid="emoji-picker" @click="handleAward" @shown="setIsMenuOpen(true)" @hidden="setIsMenuOpen(false)" @@ -219,24 +221,6 @@ export default { </span> </template> </emoji-picker> - <gl-button - v-else - v-gl-tooltip.viewport - :class="addButtonClass" - class="add-reaction-button js-add-award" - title="Add reaction" - :aria-label="__('Add reaction')" - > - <span class="reaction-control-icon reaction-control-icon-neutral"> - <gl-icon name="slight-smile" /> - </span> - <span class="reaction-control-icon reaction-control-icon-positive"> - <gl-icon name="smiley" /> - </span> - <span class="reaction-control-icon reaction-control-icon-super-positive"> - <gl-icon name="smile" /> - </span> - </gl-button> </div> </div> </template> |