diff options
| author | tamaina <tamaina@hotmail.co.jp> | 2022-12-25 07:13:18 +0000 |
|---|---|---|
| committer | tamaina <tamaina@hotmail.co.jp> | 2022-12-25 07:13:18 +0000 |
| commit | d4accb48e1b87313b0b8701b8d34cdf3abe8741b (patch) | |
| tree | 26cb4da53972b8905d1cac96a1f3c4401307e2f4 | |
| parent | fix (diff) | |
| parent | fix (diff) | |
| download | sharkey-d4accb48e1b87313b0b8701b8d34cdf3abe8741b.tar.gz sharkey-d4accb48e1b87313b0b8701b8d34cdf3abe8741b.tar.bz2 sharkey-d4accb48e1b87313b0b8701b8d34cdf3abe8741b.zip | |
Merge remote-tracking branch 'refs/remotes/origin/develop' into develop
| -rw-r--r-- | packages/client/src/components/global/MkEmoji.vue | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/client/src/components/global/MkEmoji.vue b/packages/client/src/components/global/MkEmoji.vue index 440ef6220d..419850d007 100644 --- a/packages/client/src/components/global/MkEmoji.vue +++ b/packages/client/src/components/global/MkEmoji.vue @@ -1,6 +1,6 @@ <template> <img v-if="customEmoji" class="mk-emoji custom" :class="{ normal, noStyle }" :src="url" :alt="alt" :title="alt" decoding="async"/> -<img v-else-if="char && !useOsNativeEmojis" class="mk-emoji" :src="url" decoding="async" @pointerenter="computeTitle"/> +<img v-else-if="char && !useOsNativeEmojis" class="mk-emoji" :src="url" :alt="alt" decoding="async" @pointerenter="computeTitle"/> <span v-else-if="char && useOsNativeEmojis" :alt="alt" @pointerenter="computeTitle">{{ char }}</span> <span v-else>{{ emoji }}</span> </template> @@ -39,6 +39,7 @@ const url = computed(() => { }); const alt = computed(() => customEmoji.value ? `:${customEmoji.value.name}:` : char.value); +// Searching from an array with 2000 items for every emoji felt like too energy-consuming, so I decided to do it lazily on pointerenter function computeTitle(event: PointerEvent): void { const title = customEmoji.value ? `:${customEmoji.value.name}:` |