aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files/js
diff options
context:
space:
mode:
authorVincent Petry <pvince81@owncloud.com>2014-05-22 11:16:42 +0200
committerVincent Petry <pvince81@owncloud.com>2014-05-22 11:16:42 +0200
commitd6e1643a0e448c45f35311c3635125a2c0f39a45 (patch)
tree13d3410e35f8762be461b207b81a09883a55530c /apps/files/js
parent542b3958580ea77879d8c941a167af75972fa60c (diff)
downloadnextcloud-server-d6e1643a0e448c45f35311c3635125a2c0f39a45.tar.gz
nextcloud-server-d6e1643a0e448c45f35311c3635125a2c0f39a45.zip
Fix dropping files below the table
Diffstat (limited to 'apps/files/js')
-rw-r--r--apps/files/js/filelist.js5
1 files changed, 2 insertions, 3 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 3d107c7ca7a..9f6840eab13 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -1517,10 +1517,9 @@
fileUploadStart.on('fileuploaddrop', function(e, data) {
OC.Upload.log('filelist handle fileuploaddrop', e, data);
-
var dropTarget = $(e.originalEvent.target);
- // check if dropped inside this list and not another one
- if (dropTarget.length && !self.$el.has(dropTarget).length) {
+ // check if dropped inside this container and not another one
+ if (dropTarget.length && !self.$el.is(dropTarget) && !self.$el.has(dropTarget).length) {
return false;
}