summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authortamaina <tamaina@hotmail.co.jp>2023-02-03 21:21:36 +0000
committertamaina <tamaina@hotmail.co.jp>2023-02-03 21:21:36 +0000
commitb2a67ba5ca82a988d7f83dac721c1f5641f94b81 (patch)
treebd4dfe20dda988e27eaaeb882d0464bba7d7b08f /packages
parentfix(client): カスタム絵文字にアニメーション画像を再生し... (diff)
downloadsharkey-b2a67ba5ca82a988d7f83dac721c1f5641f94b81.tar.gz
sharkey-b2a67ba5ca82a988d7f83dac721c1f5641f94b81.tar.bz2
sharkey-b2a67ba5ca82a988d7f83dac721c1f5641f94b81.zip
fix(client): オートコンプリートでUnicode絵文字がカスタム絵文字として表示されてしまうのを修正
Diffstat (limited to 'packages')
-rw-r--r--packages/frontend/src/components/MkAutocomplete.vue3
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/frontend/src/components/MkAutocomplete.vue b/packages/frontend/src/components/MkAutocomplete.vue
index 27997eb330..e523b988b0 100644
--- a/packages/frontend/src/components/MkAutocomplete.vue
+++ b/packages/frontend/src/components/MkAutocomplete.vue
@@ -17,7 +17,8 @@
</ol>
<ol v-else-if="emojis.length > 0" ref="suggests" :class="$style.list">
<li v-for="emoji in emojis" :key="emoji.emoji" :class="$style.item" tabindex="-1" @click="complete(type, emoji.emoji)" @keydown="onKeydown">
- <MkCustomEmoji :name="emoji.emoji" :class="$style.emoji"/>
+ <MkCustomEmoji v-if="'isCustomEmoji' in emoji && emoji.isCustomEmoji" :name="emoji.emoji" :class="$style.emoji"/>
+ <MkEmoji v-else :emoji="emoji.emoji" :class="$style.emoji"/>
<!-- eslint-disable-next-line vue/no-v-html -->
<span v-if="q" :class="$style.emojiName" v-html="sanitizeHtml(emoji.name.replace(q, `<b>${q}</b>`))"></span>
<span v-else v-text="emoji.name"></span>