diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2020-02-13 03:11:37 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2020-02-13 03:11:37 +0900 |
| commit | 83ad9f369f44cb883ab3a2fc015030a728c2a93f (patch) | |
| tree | 9bcb6ab765ac89f8898445d9b56f028cf7cae5a2 /src/client/components | |
| parent | Update about-misskey.vue (diff) | |
| download | misskey-83ad9f369f44cb883ab3a2fc015030a728c2a93f.tar.gz misskey-83ad9f369f44cb883ab3a2fc015030a728c2a93f.tar.bz2 misskey-83ad9f369f44cb883ab3a2fc015030a728c2a93f.zip | |
OSネイティブの絵文字を使用オプション
Diffstat (limited to 'src/client/components')
| -rw-r--r-- | src/client/components/autocomplete.vue | 6 | ||||
| -rw-r--r-- | src/client/components/emoji.vue | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/client/components/autocomplete.vue b/src/client/components/autocomplete.vue index f17351a6f0..c8e0ae6d76 100644 --- a/src/client/components/autocomplete.vue +++ b/src/client/components/autocomplete.vue @@ -18,7 +18,7 @@ <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="$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-if="!useOsNativeEmojis"><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> <span class="alias" v-if="emoji.aliasOf">({{ emoji.aliasOf }})</span> @@ -130,8 +130,8 @@ export default Vue.extend({ return (this.$refs.suggests as Element).children; }, - useOsDefaultEmojis(): boolean { - return this.$store.state.device.useOsDefaultEmojis; + useOsNativeEmojis(): boolean { + return this.$store.state.device.useOsNativeEmojis; } }, diff --git a/src/client/components/emoji.vue b/src/client/components/emoji.vue index 7784a1bf17..277ba1a07d 100644 --- a/src/client/components/emoji.vue +++ b/src/client/components/emoji.vue @@ -1,7 +1,7 @@ <template> <img v-if="customEmoji" class="mk-emoji custom" :class="{ normal, noStyle }" :src="url" :alt="alt" :title="alt"/> -<img v-else-if="char && !useOsDefaultEmojis" class="mk-emoji" :src="url" :alt="alt" :title="alt"/> -<span v-else-if="char && useOsDefaultEmojis">{{ char }}</span> +<img v-else-if="char && !useOsNativeEmojis" class="mk-emoji" :src="url" :alt="alt" :title="alt"/> +<span v-else-if="char && useOsNativeEmojis">{{ char }}</span> <span v-else>:{{ name }}:</span> </template> @@ -53,8 +53,8 @@ export default Vue.extend({ return this.customEmoji ? `:${this.customEmoji.name}:` : this.char; }, - useOsDefaultEmojis(): boolean { - return this.$store.state.device.useOsDefaultEmojis && !this.isReaction; + useOsNativeEmojis(): boolean { + return this.$store.state.device.useOsNativeEmojis && !this.isReaction; }, ce() { |