From ca71722c1eaa5c2aa4597bef38ca812c15294359 Mon Sep 17 00:00:00 2001
From: shpuld <shpuld@gmail.com>
Date: Tue, 21 Feb 2017 15:13:19 +0200
Subject: [PATCH 1/2] Files dropped into post_status_form text box get sent to
 media_upload for attachment upload, media_upload reorganized a bit to allow
 reuse of existing code.

---
 src/components/media_upload/media_upload.js   | 26 ++++++++++++++-----
 .../post_status_form/post_status_form.js      |  7 +++++
 .../post_status_form/post_status_form.vue     |  4 +--
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/src/components/media_upload/media_upload.js b/src/components/media_upload/media_upload.js
index 3f2e39641b..3f6fec5b0c 100644
--- a/src/components/media_upload/media_upload.js
+++ b/src/components/media_upload/media_upload.js
@@ -3,12 +3,22 @@ import statusPosterService from '../../services/status_poster/status_poster.serv
 
 const mediaUpload = {
   mounted () {
-    const store = this.$store
     const input = this.$el.querySelector('input')
-    const self = this
 
     input.addEventListener('change', ({target}) => {
       const file = target.files[0]
+      this.uploadFile(file)
+    })
+  },
+  data () {
+    return {
+      uploading: false
+    }
+  },
+  methods: {
+    uploadFile(file) {
+      const self = this
+      const store = this.$store
       const formData = new FormData()
       formData.append('media', file)
 
@@ -23,11 +33,15 @@ const mediaUpload = {
           self.$emit('upload-failed')
           self.uploading = false
         })
-    })
+    }
   },
-  data () {
-    return {
-      uploading: false
+  props: [
+    'dropFiles'
+  ],
+  watch: {
+    'dropFiles': function (fileInfos) {
+      if (!this.uploading)
+        this.uploadFile(fileInfos[0])
     }
   }
 }
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 3365c5696f..e798b1964b 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -84,6 +84,7 @@ const PostStatusForm = {
     }
 
     return {
+      dropFiles: [],
       submitDisabled: false,
       newStatus: {
         status: statusText,
@@ -141,6 +142,12 @@ const PostStatusForm = {
     },
     type (fileInfo) {
       return fileTypeService.fileType(fileInfo.mimetype)
+    },
+    fileDrop (e) {
+      if(e.dataTransfer.files.length > 0) {
+        e.preventDefault()  // allow dropping text like before
+        this.dropFiles = e.dataTransfer.files
+      }
     }
   }
 }
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 1bad41c711..57572f6518 100644
--- 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" >
-        <textarea v-model="newStatus.status" placeholder="Just landed in L.A." rows="3" class="form-control"  @keyup.ctrl.enter="postStatus(newStatus)"></textarea>
+        <textarea v-model="newStatus.status" placeholder="Just landed in L.A." rows="3" class="form-control"  @keyup.ctrl.enter="postStatus(newStatus)" @drop="fileDrop"></textarea>
       </div>
       <div class="attachments">
         <div class="attachment" v-for="file in newStatus.files">
@@ -14,7 +14,7 @@
         </div>
       </div>
       <div class='form-bottom'>
-        <media-upload @uploading="disableSubmit" @uploaded="addMediaFile" @upload-failed="enableSubmit"></media-upload>
+        <media-upload @uploading="disableSubmit" @uploaded="addMediaFile" @upload-failed="enableSubmit" :drop-files="dropFiles"></media-upload>
         <button :disabled="submitDisabled" type="submit" class="btn btn-default">Submit</button>
       </div>
     </form>

From 892b826df59203a920bfebbd2ac37ef62dcf411b Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Tue, 21 Feb 2017 21:48:48 +0100
Subject: [PATCH 2/2] Small style adjustment, add meta-enter posting.

---
 src/components/media_upload/media_upload.js          | 5 +++--
 src/components/post_status_form/post_status_form.js  | 2 +-
 src/components/post_status_form/post_status_form.vue | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/components/media_upload/media_upload.js b/src/components/media_upload/media_upload.js
index 3f6fec5b0c..746970aad8 100644
--- a/src/components/media_upload/media_upload.js
+++ b/src/components/media_upload/media_upload.js
@@ -16,7 +16,7 @@ const mediaUpload = {
     }
   },
   methods: {
-    uploadFile(file) {
+    uploadFile (file) {
       const self = this
       const store = this.$store
       const formData = new FormData()
@@ -40,8 +40,9 @@ const mediaUpload = {
   ],
   watch: {
     'dropFiles': function (fileInfos) {
-      if (!this.uploading)
+      if (!this.uploading) {
         this.uploadFile(fileInfos[0])
+      }
     }
   }
 }
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index e798b1964b..d55525bb38 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -144,7 +144,7 @@ const PostStatusForm = {
       return fileTypeService.fileType(fileInfo.mimetype)
     },
     fileDrop (e) {
-      if(e.dataTransfer.files.length > 0) {
+      if (e.dataTransfer.files.length > 0) {
         e.preventDefault()  // allow dropping text like before
         this.dropFiles = e.dataTransfer.files
       }
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index d9138109c7..eceef4a285 100644
--- 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" >
-        <textarea v-model="newStatus.status" placeholder="Just landed in L.A." rows="3" class="form-control"  @keyup.ctrl.enter="postStatus(newStatus)" @drop="fileDrop"></textarea>
+        <textarea v-model="newStatus.status" placeholder="Just landed in L.A." rows="3" class="form-control" @keyup.meta.enter="postStatus(newStatus)" @keyup.ctrl.enter="postStatus(newStatus)" @drop="fileDrop"></textarea>
       </div>
       <div class="attachments">
         <div class="attachment" v-for="file in newStatus.files">