From 42bffa9522863c1b8943ff40ad21f16641f412f5 Mon Sep 17 00:00:00 2001 From: Popescu Dan Date: Fri, 10 Jul 2020 14:40:01 +0300 Subject: [PATCH] fix(QFile, QUploader): accept any file if there is '*' or '*/*' in the accept prop #7166 (#7377) --- ui/src/mixins/file.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ui/src/mixins/file.js b/ui/src/mixins/file.js index 8c0cf13d1d5..4e3cf6b793b 100644 --- a/ui/src/mixins/file.js +++ b/ui/src/mixins/file.js @@ -32,8 +32,9 @@ export default { if (this.accept !== void 0) { return this.accept.split(',').map(ext => { ext = ext.trim() - // support "image/*" - if (ext.endsWith('/*')) { + if (ext === '*') { // support "*" + return '*/' + } else if (ext.endsWith('/*')) { // support "image/*" or "*/*" ext = ext.slice(0, ext.length - 1) } return ext.toUpperCase() @@ -75,7 +76,7 @@ export default { } // filter file types - if (this.accept !== void 0) { + if (this.accept !== void 0 && this.extensions.indexOf('*/') === -1) { files = filterFiles(files, rejectedFiles, 'accept', file => { return this.extensions.some(ext => ( file.type.toUpperCase().startsWith(ext) ||