summaryrefslogtreecommitdiff
path: root/src/client/pages
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2021-02-27 13:08:34 +0900
committersyuilo <syuilotan@yahoo.co.jp>2021-02-27 13:08:34 +0900
commitf29d417b30be5479a04a1898b883d9fa1cf11fe9 (patch)
tree64dc364352829609481c141bae38bcf4228ab5c9 /src/client/pages
parentlocaleが古い場合自動更新するように (diff)
downloadmisskey-f29d417b30be5479a04a1898b883d9fa1cf11fe9.tar.gz
misskey-f29d417b30be5479a04a1898b883d9fa1cf11fe9.tar.bz2
misskey-f29d417b30be5479a04a1898b883d9fa1cf11fe9.zip
絵文字ピッカーを常に表示するように
Resolve #7265
Diffstat (limited to 'src/client/pages')
-rw-r--r--src/client/pages/messaging/messaging-room.form.vue4
-rw-r--r--src/client/pages/settings/reaction.vue2
2 files changed, 2 insertions, 4 deletions
diff --git a/src/client/pages/messaging/messaging-room.form.vue b/src/client/pages/messaging/messaging-room.form.vue
index 258300dc52..5e675a3f12 100644
--- a/src/client/pages/messaging/messaging-room.form.vue
+++ b/src/client/pages/messaging/messaging-room.form.vue
@@ -223,9 +223,7 @@ export default defineComponent({
},
async insertEmoji(ev) {
- os.pickEmoji(ev.currentTarget || ev.target).then(emoji => {
- insertTextAtCursor(this.$refs.text, emoji);
- });
+ os.openEmojiPicker(ev.currentTarget || ev.target, {}, this.$refs.text);
}
}
});
diff --git a/src/client/pages/settings/reaction.vue b/src/client/pages/settings/reaction.vue
index 798ffb33d1..4488e50051 100644
--- a/src/client/pages/settings/reaction.vue
+++ b/src/client/pages/settings/reaction.vue
@@ -105,7 +105,7 @@ export default defineComponent({
},
preview(ev) {
- os.popup(import('@/components/emoji-picker.vue'), {
+ os.popup(import('@/components/emoji-picker-dialog.vue'), {
asReactionPicker: true,
src: ev.currentTarget || ev.target,
}, {}, 'closed');