summaryrefslogtreecommitdiffstats
path: root/apps/files/js/file-upload.js
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2017-08-24 14:55:17 +0200
committerMorris Jobke <hey@morrisjobke.de>2017-08-26 11:30:04 +0200
commit69d2d0178a46b72bea2d4618bbd2f42456b9e761 (patch)
tree8df7cdd05f32a9da3e87f06e0617d31d60678073 /apps/files/js/file-upload.js
parentca490bafb950b9d16ab4543ae810c3a67cb84d5b (diff)
downloadnextcloud-server-69d2d0178a46b72bea2d4618bbd2f42456b9e761.tar.gz
nextcloud-server-69d2d0178a46b72bea2d4618bbd2f42456b9e761.zip
Don't try the actual file upload if the checks already error out
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'apps/files/js/file-upload.js')
-rw-r--r--apps/files/js/file-upload.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 1f99d561a13..b86b42bdb9a 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -1113,6 +1113,9 @@ OC.Uploader.prototype = _.extend({
});
fileupload.on('fileuploaddrop', function(e, data) {
self.trigger('drop', e, data);
+ if (e.isPropagationStopped()) {
+ return false;
+ }
});
}