commit: f72d6ec83ef753241a9329306c0b3fdf1c3cf534
parent: da9cfdd06c9fc0a5359fa362d620e53fe286216e
Author: Shpuld Shpludson <shp@cock.li>
Date: Tue, 28 Nov 2017 20:37:56 +0000
Merge branch 'clipboardImage' into 'develop'
Added ability to copy-paste image right from the clipboard.
See merge request pleroma/pleroma-fe!179
Diffstat:
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
@@ -153,6 +153,14 @@ const PostStatusForm = {
type (fileInfo) {
return fileTypeService.fileType(fileInfo.mimetype)
},
+ paste (e) {
+ if (e.clipboardData.files.length > 0) {
+ // Strangely, files property gets emptied after event propagation
+ // Trying to wrap it in array doesn't work. Plus I doubt it's possible
+ // to hold more than one file in clipboard.
+ this.dropFiles = [e.clipboardData.files[0]]
+ }
+ },
fileDrop (e) {
if (e.dataTransfer.files.length > 0) {
e.preventDefault() // allow dropping text like before
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
@@ -2,7 +2,7 @@
<div class="post-status-form">
<form @submit.prevent="postStatus(newStatus)">
<div class="form-group base03-border" >
- <textarea @click="setCaret" @keyup="setCaret" v-model="newStatus.status" :placeholder="$t('post_status.default')" rows="1" class="form-control" @keydown.meta.enter="postStatus(newStatus)" @keyup.ctrl.enter="postStatus(newStatus)" @drop="fileDrop" @dragover.prevent="fileDrag" @input="resize"></textarea>
+ <textarea @click="setCaret" @keyup="setCaret" v-model="newStatus.status" :placeholder="$t('post_status.default')" rows="1" class="form-control" @keydown.meta.enter="postStatus(newStatus)" @keyup.ctrl.enter="postStatus(newStatus)" @drop="fileDrop" @dragover.prevent="fileDrag" @input="resize" @paste="paste"></textarea>
</div>
<div style="position:relative;" v-if="candidates">
<div class="autocomplete-panel base05-background">