From: Vincent Petry Date: Thu, 22 May 2014 09:16:42 +0000 (+0200) Subject: Fix dropping files below the table X-Git-Tag: v7.0.0alpha2~176^2 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d6e1643a0e448c45f35311c3635125a2c0f39a45;p=nextcloud-server.git Fix dropping files below the table --- diff --git a/apps/files/css/files.css b/apps/files/css/files.css index 009cb355ba7..e397d27e83b 100644 --- a/apps/files/css/files.css +++ b/apps/files/css/files.css @@ -91,6 +91,11 @@ position: relative; } +/* fit app list view heights */ +.app-files #app-content>.viewcontainer { + height: 100%; +} + /** * Override global #controls styles * to be more flexible / relative 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; } diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php index 8cab4ce220b..b52effb1e78 100644 --- a/apps/files/templates/index.php +++ b/apps/files/templates/index.php @@ -2,7 +2,7 @@ printPage(); ?>
-