Merge branch 'emoji-selector-update' into shigusegubu

* emoji-selector-update: fix some bugs
2019-09-24 00:08:13 +03:00 · 2019-09-24 00:08:13 +03:00 · 04b8e8f118
commit 04b8e8f118
parent 3364c8fe01 2154152d08
2 changed files with 2 additions and 2 deletions
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@ -249,7 +249,7 @@ const PostStatusForm = {
      return fileTypeService.fileType(fileInfo.mimetype)
    },
    paste (e) {
-      this.resize()
+      this.resize(e)
      if (e.clipboardData.files.length > 0) {
        // prevent pasting of file as text
        e.preventDefault()
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@ -96,7 +96,7 @@
            @keyup.ctrl.enter="postStatus(newStatus)"
            @drop="fileDrop"
            @dragover.prevent="fileDrag"
-            @keydown.exact="resize"
+            @input="resize"
            @compositionupdate="resize"
            @paste="paste"
          />