OSネイティブの絵文字を使用オプション
This commit is contained in:
		
							parent
							
								
									3a78b62520
								
							
						
					
					
						commit
						83ad9f369f
					
				
					 6 changed files with 19 additions and 10 deletions
				
			
		| 
						 | 
				
			
			@ -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;
 | 
			
		||||
		}
 | 
			
		||||
	},
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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() {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -23,8 +23,10 @@
 | 
			
		|||
		<mk-button @click="readAllMessagingMessages">{{ $t('markAsReadAllTalkMessages') }}</mk-button>
 | 
			
		||||
	</div>
 | 
			
		||||
	<div class="_content">
 | 
			
		||||
		<mk-switch v-model="reduceAnimation">
 | 
			
		||||
			{{ $t('reduceUiAnimation') }}
 | 
			
		||||
		<mk-switch v-model="reduceAnimation">{{ $t('reduceUiAnimation') }}</mk-switch>
 | 
			
		||||
		<mk-switch v-model="useOsNativeEmojis">
 | 
			
		||||
			{{ $t('useOsNativeEmojis') }}
 | 
			
		||||
			<template #desc><mfm text="🍮🍦🍭🍩🍰🍫🍬🥞🍪"/></template>
 | 
			
		||||
		</mk-switch>
 | 
			
		||||
	</div>
 | 
			
		||||
	<div class="_content">
 | 
			
		||||
| 
						 | 
				
			
			@ -81,6 +83,11 @@ export default Vue.extend({
 | 
			
		|||
			get() { return !this.$store.state.device.animation; },
 | 
			
		||||
			set(value) { this.$store.commit('device/set', { key: 'animation', value: !value }); }
 | 
			
		||||
		},
 | 
			
		||||
 | 
			
		||||
		useOsNativeEmojis: {
 | 
			
		||||
			get() { return this.$store.state.device.useOsNativeEmojis; },
 | 
			
		||||
			set(value) { this.$store.commit('device/set', { key: 'useOsNativeEmojis', value }); }
 | 
			
		||||
		},
 | 
			
		||||
	},
 | 
			
		||||
 | 
			
		||||
	watch: {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -31,7 +31,7 @@ const defaultDeviceSettings = {
 | 
			
		|||
	lang: null,
 | 
			
		||||
	loadRawImages: false,
 | 
			
		||||
	alwaysShowNsfw: false,
 | 
			
		||||
	useOsDefaultEmojis: false,
 | 
			
		||||
	useOsNativeEmojis: false,
 | 
			
		||||
	autoReload: false,
 | 
			
		||||
	accounts: [],
 | 
			
		||||
	recentEmojis: [],
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue