diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2019-06-16 16:09:04 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2019-06-16 16:09:04 +0900 |
| commit | 5cc1aab5301ad1f9166bbf0420fbaf35fd623c0d (patch) | |
| tree | ed1475a6bf243dcff6af71d90c8c299ee9d2cedb /src/client | |
| parent | Merge branch 'develop' (diff) | |
| parent | 11.21.0 (diff) | |
| download | misskey-5cc1aab5301ad1f9166bbf0420fbaf35fd623c0d.tar.gz misskey-5cc1aab5301ad1f9166bbf0420fbaf35fd623c0d.tar.bz2 misskey-5cc1aab5301ad1f9166bbf0420fbaf35fd623c0d.zip | |
Merge branch 'develop'
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: [], |