Skip to content

fix(form-file): issue with "accept" values (fixes #1526, reverts #2028) #2008

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 27, 2018
Merged

fix(form-file): issue with "accept" values (fixes #1526, reverts #2028) #2008

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
35dc358
fix(form-file): fixes #1526
impowski Aug 30, 2018
95793ef
Update form-file.js
tmorehouse Oct 27, 2018
dae59da
Merge branch 'dev' into fix-file-accept
tmorehouse Oct 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 9 additions & 14 deletions src/components/form-file/form-file.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,23 +183,18 @@ export default {
setFiles (files) {
if (!files) {
this.selectedFile = null
return
}
if (!this.multiple) {
let firstElement = files[0]
if (firstElement.type.match(this.accept)) {
this.selectedFile = firstElement
}
return
}
// Convert files to array
const filesArray = []
for (let i = 0; i < files.length; i++) {
if (files[i].type.match(this.accept)) {
} 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]
}
this.selectedFile = filesArray
},
dragover (evt) {
evt.preventDefault()
Expand Down