Merge branch 'develop' into sw-notification-action

2021-02-28 18:59:21 +09:00
parent c88d7a1087 68ace4a311
commit 3d67998cbc
86 changed files with 1100 additions and 472 deletions
--- a/src/client/components/post-form.vue
+++ b/src/client/components/post-form.vue
@@ -632,9 +632,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);
 		},

 		showActions(ev) {