-
+
{{ emoji.emoji }}
({{ emoji.aliasOf }})
@@ -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 @@
-
-{{ char }}
+
+{{ char }}
:{{ name }}:
@@ -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() {
diff --git a/src/client/pages/settings/general.vue b/src/client/pages/settings/general.vue
index 90803636b9..5ab2ce91b6 100644
--- a/src/client/pages/settings/general.vue
+++ b/src/client/pages/settings/general.vue
@@ -23,8 +23,10 @@
{{ $t('markAsReadAllTalkMessages') }}
-
- {{ $t('reduceUiAnimation') }}
+ {{ $t('reduceUiAnimation') }}
+
+ {{ $t('useOsNativeEmojis') }}
+
@@ -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: {
diff --git a/src/client/store.ts b/src/client/store.ts
index 711b808d53..0bfcd07ccd 100644
--- a/src/client/store.ts
+++ b/src/client/store.ts
@@ -31,7 +31,7 @@ const defaultDeviceSettings = {
lang: null,
loadRawImages: false,
alwaysShowNsfw: false,
- useOsDefaultEmojis: false,
+ useOsNativeEmojis: false,
autoReload: false,
accounts: [],
recentEmojis: [],