From ca71722c1eaa5c2aa4597bef38ca812c15294359 Mon Sep 17 00:00:00 2001
From: shpuld <shpuld@gmail.com>
Date: Tue, 21 Feb 2017 15:13:19 +0200
Subject: 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 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

(limited to 'src/components/media_upload/media_upload.js')

diff --git a/src/components/media_upload/media_upload.js b/src/components/media_upload/media_upload.js
index 3f2e3964..3f6fec5b 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])
     }
   }
 }
-- 
cgit v1.2.3-70-g09d2


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: 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(-)

(limited to 'src/components/media_upload/media_upload.js')

diff --git a/src/components/media_upload/media_upload.js b/src/components/media_upload/media_upload.js
index 3f6fec5b..746970aa 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 e798b196..d55525bb 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 d9138109..eceef4a2 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">
-- 
cgit v1.2.3-70-g09d2


From 6c385ae80aaf763db7f973b5dc1e3bd21367a2a7 Mon Sep 17 00:00:00 2001
From: shpuld <shpuld@gmail.com>
Date: Wed, 22 Feb 2017 14:53:05 +0200
Subject: Make drag&drop work on more browsers/platforms, make the Upload
 button accept drops as well.

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

(limited to 'src/components/media_upload/media_upload.js')

diff --git a/src/components/media_upload/media_upload.js b/src/components/media_upload/media_upload.js
index 3f6fec5b..2f312ec9 100644
--- a/src/components/media_upload/media_upload.js
+++ b/src/components/media_upload/media_upload.js
@@ -33,6 +33,20 @@ const mediaUpload = {
           self.$emit('upload-failed')
           self.uploading = false
         })
+    },
+    fileDrop (e) {
+      if(e.dataTransfer.files.length > 0) {
+        e.preventDefault()  // allow dropping text like before
+        this.uploadFile(e.dataTransfer.files[0])
+      }
+    },
+    fileDrag (e) {
+      let types = e.dataTransfer.types
+      if(types.contains('Files')) {
+        e.dataTransfer.dropEffect = 'copy'
+      } else {
+        e.dataTransfer.dropEffect = 'none'
+      }
     }
   },
   props: [
diff --git a/src/components/media_upload/media_upload.vue b/src/components/media_upload/media_upload.vue
index 3302db37..b839067b 100644
--- a/src/components/media_upload/media_upload.vue
+++ b/src/components/media_upload/media_upload.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="media-upload">
+  <div class="media-upload" @drop.prevent @dragover.prevent="fileDrag" @drop="fileDrop">
     <label class="btn btn-default">
       <i class="fa icon-spin4 animate-spin" v-if="uploading"></i>
       <i class="fa icon-upload" v-if="!uploading"></i>
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index e798b196..21d9759f 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -148,6 +148,9 @@ const PostStatusForm = {
         e.preventDefault()  // allow dropping text like before
         this.dropFiles = e.dataTransfer.files
       }
+    },
+    fileDrag (e) {
+      e.dataTransfer.dropEffect = 'copy';
     }
   }
 }
diff --git a/src/components/post_status_form/post_status_form.vue b/src/components/post_status_form/post_status_form.vue
index 57572f65..fa471ec5 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.ctrl.enter="postStatus(newStatus)" @drop="fileDrop" @dragover.prevent="fileDrag"></textarea>
       </div>
       <div class="attachments">
         <div class="attachment" v-for="file in newStatus.files">
-- 
cgit v1.2.3-70-g09d2


From 5abf857705a6e2eb1a81c29bf906999fd91624f4 Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Wed, 22 Feb 2017 22:33:28 +0100
Subject: Style fixes.

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

(limited to 'src/components/media_upload/media_upload.js')

diff --git a/src/components/media_upload/media_upload.js b/src/components/media_upload/media_upload.js
index 985916cf..7888d999 100644
--- a/src/components/media_upload/media_upload.js
+++ b/src/components/media_upload/media_upload.js
@@ -35,14 +35,14 @@ const mediaUpload = {
         })
     },
     fileDrop (e) {
-      if(e.dataTransfer.files.length > 0) {
+      if (e.dataTransfer.files.length > 0) {
         e.preventDefault()  // allow dropping text like before
         this.uploadFile(e.dataTransfer.files[0])
       }
     },
     fileDrag (e) {
       let types = e.dataTransfer.types
-      if(types.contains('Files')) {
+      if (types.contains('Files')) {
         e.dataTransfer.dropEffect = 'copy'
       } else {
         e.dataTransfer.dropEffect = 'none'
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 42ebcd48..4a409115 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -150,7 +150,7 @@ const PostStatusForm = {
       }
     },
     fileDrag (e) {
-      e.dataTransfer.dropEffect = 'copy';
+      e.dataTransfer.dropEffect = 'copy'
     }
   }
 }
-- 
cgit v1.2.3-70-g09d2


From 9778d4cfc04450a4fd9f1330c35df8487c8993bf Mon Sep 17 00:00:00 2001
From: Roger Braun <roger@rogerbraun.net>
Date: Wed, 22 Feb 2017 22:43:40 +0100
Subject: More eslint fixes.

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

(limited to 'src/components/media_upload/media_upload.js')

diff --git a/src/components/delete_button/delete_button.js b/src/components/delete_button/delete_button.js
index 726509d0..77da1b87 100644
--- a/src/components/delete_button/delete_button.js
+++ b/src/components/delete_button/delete_button.js
@@ -2,7 +2,7 @@ const DeleteButton = {
   props: [ 'status' ],
   methods: {
     deleteStatus () {
-      const confirmed = confirm('Do you really want to delete this status?')
+      const confirmed = window.confirm('Do you really want to delete this status?')
       if (confirmed) {
         this.$store.dispatch('deleteStatus', { id: this.status.id })
       }
@@ -10,7 +10,7 @@ const DeleteButton = {
   },
   computed: {
     currentUser () { return this.$store.state.users.currentUser },
-    canDelete () { return this.currentUser.rights.delete_others_notice || this.status.user.id == this.currentUser.id }
+    canDelete () { return this.currentUser.rights.delete_others_notice || this.status.user.id === this.currentUser.id }
   }
 }
 
diff --git a/src/components/media_upload/media_upload.js b/src/components/media_upload/media_upload.js
index 7888d999..8b4e7ad4 100644
--- a/src/components/media_upload/media_upload.js
+++ b/src/components/media_upload/media_upload.js
@@ -29,7 +29,7 @@ const mediaUpload = {
         .then((fileData) => {
           self.$emit('uploaded', fileData)
           self.uploading = false
-        }, (error) => {
+        }, (error) => { // eslint-disable-line handle-callback-err
           self.$emit('upload-failed')
           self.uploading = false
         })
diff --git a/src/components/post_status_form/post_status_form.js b/src/components/post_status_form/post_status_form.js
index 4a409115..01aeeb68 100644
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@@ -49,7 +49,7 @@ const defaultCollection = {
   menuContainer: document.body,
 
   // column to search against in the object (accepts function or string)
-  lookup: ({name, screen_name}) => `${name} (@${screen_name})`,
+  lookup: ({name, screen_name}) => `${name} (@${screen_name})`, // eslint-disable-line camelcase
 
   // column that contains the content to insert by default
   fillAttr: 'screen_name',
-- 
cgit v1.2.3-70-g09d2