summaryrefslogtreecommitdiffstats
path: root/apps/files/js/file-upload.js
diff options
context:
space:
mode:
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;
+ }
});
}