hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'emoji-selector-update' into shigusegubu

Browse source 
* emoji-selector-update:
  fix some bugs
This commit is contained in:
Henry Jameson 2019-09-24 00:08:13 +03:00
commit 04b8e8f118
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/post_status_form/post_status_form.js
View file

@ -249,7 +249,7 @@ const PostStatusForm = {
return fileTypeService.fileType(fileInfo.mimetype) return fileTypeService.fileType(fileInfo.mimetype)
}, },
paste (e) { paste (e) {
this.resize() this.resize(e)
if (e.clipboardData.files.length > 0) { if (e.clipboardData.files.length > 0) {
// prevent pasting of file as text // prevent pasting of file as text
e.preventDefault() e.preventDefault()

2
src/components/post_status_form/post_status_form.vue
View file

@ -96,7 +96,7 @@
@keyup.ctrl.enter="postStatus(newStatus)" @keyup.ctrl.enter="postStatus(newStatus)"
@drop="fileDrop" @drop="fileDrop"
@dragover.prevent="fileDrag" @dragover.prevent="fileDrag"
@keydown.exact="resize" @input="resize"
@compositionupdate="resize" @compositionupdate="resize"
@paste="paste" @paste="paste"
/> />