From 9472aad8777744b7ebaaa1fb78be7624e5edc6ca Mon Sep 17 00:00:00 2001
From: Henrique Dias <hacdias@gmail.com>
Date: Sun, 29 Oct 2017 13:07:48 +0000
Subject: [PATCH] Fix #262 #266

Former-commit-id: 0acca700ed0a2ced8bf6b5b019aa6ff4774b8ea8 [formerly 0ff934dd107e56f4b7349f1363dfb1b6cbbc7916] [formerly f8b60e60087d754b46ca4dad49a151bec299febd [formerly ae1702c4e267c9cb9519c6056fb2f0a2203c588f]]
Former-commit-id: 824abe0c6cb5d32c061e8efd4a7f1d3354b3dbfe [formerly 655809d5c670c9de352c473de1fe08303a4c5506]
Former-commit-id: 6ca6f383602241b8a50c13cce5b066cd5f2cf990
---
 .gitignore                              |  2 ++
 assets/src/components/files/Listing.vue |  4 ++++
 package-lock.json                       | 18 +++++++++---------
 rice-box.go.REMOVED.git-id              |  2 +-
 4 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index c774651a..052f7511 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,5 @@ node_modules/
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+.idea
+.vscode
diff --git a/assets/src/components/files/Listing.vue b/assets/src/components/files/Listing.vue
index f7e1f12e..93fd3179 100644
--- a/assets/src/components/files/Listing.vue
+++ b/assets/src/components/files/Listing.vue
@@ -196,6 +196,10 @@ export default {
       })
     },
     paste (event) {
+      if (event.target.tagName.toLowerCase() === 'input') {
+        return
+      }
+
       event.preventDefault()
 
       let items = []
diff --git a/package-lock.json b/package-lock.json
index 8fe14a15..f4814f2a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8055,15 +8055,6 @@
       "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
       "dev": true
     },
-    "string_decoder": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
-      "dev": true,
-      "requires": {
-        "safe-buffer": "5.1.1"
-      }
-    },
     "string-length": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/string-length/-/string-length-1.0.1.tgz",
@@ -8100,6 +8091,15 @@
         }
       }
     },
+    "string_decoder": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
+      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.1"
+      }
+    },
     "strip-ansi": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
diff --git a/rice-box.go.REMOVED.git-id b/rice-box.go.REMOVED.git-id
index 5af30a2b..eafb6a1e 100644
--- a/rice-box.go.REMOVED.git-id
+++ b/rice-box.go.REMOVED.git-id
@@ -1 +1 @@
-d7bb20a2a9de9e40331b2688b8f2b0f63deef097
\ No newline at end of file
+cc3d5748ed2706fd16dab2451b473d31d4f43c11
\ No newline at end of file