mirror of
https://github.com/paricafe/misskey.git
synced 2024-11-24 21:06:43 -06:00
Merge remote-tracking branch 'refs/remotes/origin/develop' into develop
This commit is contained in:
commit
d4accb48e1
1 changed files with 2 additions and 1 deletions
|
@ -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}:`
|
||||
|
|
Loading…
Reference in a new issue