upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-09 00:32:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 35

Merge pull request #13268 from owncloud/dnd-files-container

Browse source 
Allow dropping files on the table container
This commit is contained in:
Lukas Reschke 2015-01-12 13:27:53 +01:00
commit 5f7c115dfe
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/files/js/filelist.js
View file

@ -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;
}