From 35dc35856e156beb728f08df14e9fcf76aa10d2d Mon Sep 17 00:00:00 2001
From: Artem Biryukov <impowski@protonmail.ch>
Date: Thu, 30 Aug 2018 22:23:32 +0300
Subject: [PATCH 1/2] fix(form-file): fixes #1526

---
 src/components/form-file/form-file.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/components/form-file/form-file.js b/src/components/form-file/form-file.js
index b562c55c1ae..a6a98ac2ae2 100644
--- a/src/components/form-file/form-file.js
+++ b/src/components/form-file/form-file.js
@@ -192,9 +192,7 @@ export default {
       // Convert files to array
       const filesArray = []
       for (let i = 0; i < files.length; i++) {
-        if (files[i].type.match(this.accept)) {
-          filesArray.push(files[i])
-        }
+        filesArray.push(files[i])
       }
       this.selectedFile = filesArray
     },

From 95793ef600a7b641666f3ad58530fd3cabae38ee Mon Sep 17 00:00:00 2001
From: Troy Morehouse <troymore@nbnet.nb.ca>
Date: Sat, 27 Oct 2018 15:43:27 -0300
Subject: [PATCH 2/2] Update form-file.js

---
 src/components/form-file/form-file.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/components/form-file/form-file.js b/src/components/form-file/form-file.js
index a6a98ac2ae2..f0826029bd6 100644
--- a/src/components/form-file/form-file.js
+++ b/src/components/form-file/form-file.js
@@ -183,18 +183,18 @@ export default {
     setFiles (files) {
       if (!files) {
         this.selectedFile = null
-        return
-      }
-      if (!this.multiple) {
+      } else if (this.multiple) {
+        // Convert files to array
+        const filesArray = []
+        for (let i = 0; i < files.length; i++) {
+          filesArray.push(files[i])
+        }
+        // Return file(s) as array
+        this.selectedFile = filesArray
+      } else {
+        // Return single file object
         this.selectedFile = files[0]
-        return
-      }
-      // Convert files to array
-      const filesArray = []
-      for (let i = 0; i < files.length; i++) {
-        filesArray.push(files[i])
       }
-      this.selectedFile = filesArray
     },
     dragover (evt) {
       evt.preventDefault()