diff options
| author | MeiMei <30769358+mei23@users.noreply.github.com> | 2019-06-16 16:04:27 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-06-16 16:04:27 +0900 |
| commit | a3853611add672e9e758bfc5d0705c835a35bb5e (patch) | |
| tree | 7f41398e42e4959fa7403e515647bfe361debfc1 /src/client | |
| parent | Support Unicode 12.0 Emoji (#5062) (diff) | |
| download | sharkey-a3853611add672e9e758bfc5d0705c835a35bb5e.tar.gz sharkey-a3853611add672e9e758bfc5d0705c835a35bb5e.tar.bz2 sharkey-a3853611add672e9e758bfc5d0705c835a35bb5e.zip | |
Fix: オートコンプリートにアニメーション停止が効かない (#5061)
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/app/common/views/components/autocomplete.vue | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/client/app/common/views/components/autocomplete.vue b/src/client/app/common/views/components/autocomplete.vue index b66da49d7f..ca6599df2a 100644 --- a/src/client/app/common/views/components/autocomplete.vue +++ b/src/client/app/common/views/components/autocomplete.vue @@ -16,7 +16,7 @@ </ol> <ol class="emojis" ref="suggests" v-if="emojis.length > 0"> <li v-for="emoji in emojis" @click="complete(type, emoji.emoji)" @keydown="onKeydown" tabindex="-1"> - <span class="emoji" v-if="emoji.isCustomEmoji"><img :src="emoji.url" :alt="emoji.emoji"/></span> + <span class="emoji" v-if="emoji.isCustomEmoji"><img :src="$store.state.device.disableShowingAnimatedImages ? getStaticImageUrl(emoji.url) : emoji.url" :alt="emoji.emoji"/></span> <span class="emoji" v-else-if="!useOsDefaultEmojis"><img :src="emoji.url" :alt="emoji.emoji"/></span> <span class="emoji" v-else>{{ emoji.emoji }}</span> <span class="name" v-html="emoji.name.replace(q, `<b>${q}</b>`)"></span> @@ -31,6 +31,7 @@ import Vue from 'vue'; import * as emojilib from 'emojilib'; import contains from '../../../common/scripts/contains'; import { twemojiBase } from '../../../../../misc/twemoji-base'; +import { getStaticImageUrl } from '../../../common/scripts/get-static-image-url'; type EmojiDef = { emoji: string; @@ -78,6 +79,7 @@ export default Vue.extend({ data() { return { + getStaticImageUrl, fetching: true, users: [], hashtags: [], |