summaryrefslogtreecommitdiff
path: root/src/client/pages/settings
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2020-11-14 11:47:30 +0900
committersyuilo <syuilotan@yahoo.co.jp>2020-11-14 11:47:30 +0900
commit9c9cd168ee0c8a9d2528ef2eda6f7de0b8d8da41 (patch)
treec26440edbb46a4de77a31e64dce4a0e504921b54 /src/client/pages/settings
parentFix #6832 (diff)
downloadmisskey-9c9cd168ee0c8a9d2528ef2eda6f7de0b8d8da41.tar.gz
misskey-9c9cd168ee0c8a9d2528ef2eda6f7de0b8d8da41.tar.bz2
misskey-9c9cd168ee0c8a9d2528ef2eda6f7de0b8d8da41.zip
Improve emoji picker
Diffstat (limited to 'src/client/pages/settings')
-rw-r--r--src/client/pages/settings/reaction.vue17
1 files changed, 5 insertions, 12 deletions
diff --git a/src/client/pages/settings/reaction.vue b/src/client/pages/settings/reaction.vue
index 8033b7e11d..52b9f3260b 100644
--- a/src/client/pages/settings/reaction.vue
+++ b/src/client/pages/settings/reaction.vue
@@ -80,18 +80,11 @@ export default defineComponent({
},
preview(ev) {
- if (this.$store.state.device.useFullReactionPicker) {
- os.popup(import('@/components/emoji-picker.vue'), {
- overridePinned: this.splited,
- src: ev.currentTarget || ev.target,
- }, {}, 'closed');
- } else {
- os.popup(import('@/components/reaction-picker.vue'), {
- reactions: this.splited,
- showFocus: false,
- src: ev.currentTarget || ev.target,
- }, {}, 'closed');
- }
+ os.popup(import('@/components/emoji-picker.vue'), {
+ overridePinned: this.splited,
+ compact: !this.$store.state.device.useFullReactionPicker,
+ src: ev.currentTarget || ev.target,
+ }, {}, 'closed');
},
setDefault() {