From 512ba327f76aae0832c8e338acebcbdd6a661def Mon Sep 17 00:00:00 2001
From: Vincent Petry <pvince81@owncloud.com>
Date: Mon, 12 Jan 2015 12:29:26 +0100
Subject: [PATCH] Allow dropping files on the table container
Make it possible to drop files below the table even if the table is
smaller than the window height.
Added a check to make sure upload is not triggered on invisible lists.
---
apps/files/js/filelist.js | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 2027f62aa0..d6d5bcf912 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -1832,9 +1832,18 @@
fileUploadStart.on('fileuploaddrop', function(e, data) {
OC.Upload.log('filelist handle fileuploaddrop', e, data);
+ if (self.$el.hasClass('hidden')) {
+ // do not upload to invisible lists
+ return false;
+ }
+
var dropTarget = $(e.originalEvent.target);
// check if dropped inside this container and not another one
- if (dropTarget.length && !self.$el.is(dropTarget) && !self.$el.has(dropTarget).length) {
+ if (dropTarget.length
+ && !self.$el.is(dropTarget) // dropped on list directly
+ && !self.$el.has(dropTarget).length // dropped inside list
+ && !dropTarget.is(self.$container) // dropped on main container
+ ) {
return false;
}
--
GitLab