diff options
| author | HJ <30-hj@users.noreply.git.pleroma.social> | 2022-09-22 08:11:25 +0000 |
|---|---|---|
| committer | HJ <30-hj@users.noreply.git.pleroma.social> | 2022-09-22 08:11:25 +0000 |
| commit | 03b61f0a9cb09a47d2d9bc89c0a08c62b70c12e2 (patch) | |
| tree | 4454f5fbc5f2fff4756e410744dc36cba6e35f19 /src/components/emoji_input/emoji_input.vue | |
| parent | aa9cae8c716789b9c0952914ecbb42c1d6762b98 (diff) | |
| parent | a7f836a64e334d6c46ed1e12c7bf9b2ff4a09c7e (diff) | |
Merge branch 'from/develop/tusooa/grouped-emoji-picker' into 'develop'
Group emojis into packs in emoji picker
See merge request pleroma/pleroma-fe!1408
Diffstat (limited to 'src/components/emoji_input/emoji_input.vue')
| -rw-r--r-- | src/components/emoji_input/emoji_input.vue | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/components/emoji_input/emoji_input.vue b/src/components/emoji_input/emoji_input.vue index 81b81913..43581dbf 100644 --- a/src/components/emoji_input/emoji_input.vue +++ b/src/components/emoji_input/emoji_input.vue @@ -19,6 +19,7 @@ v-if="enableEmojiPicker" ref="picker" :class="{ hide: !showPicker }" + :showing="showPicker" :enable-sticker-picker="enableStickerPicker" class="emoji-picker-panel" @emoji="insert" @@ -63,7 +64,7 @@ v-if="!suggestion.user" class="displayText" > - {{ suggestion.displayText }} + {{ maybeLocalizedEmojiName(suggestion) }} </span> <span class="detailText">{{ suggestion.detailText }}</span> </div> |