diff options
Diffstat (limited to 'apps/files/js')
| -rw-r--r-- | apps/files/js/file-upload.js | 15 | ||||
| -rw-r--r-- | apps/files/js/filelist.js | 2 |
2 files changed, 13 insertions, 4 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index eadb57d914d..dbf08ac10b9 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -667,11 +667,22 @@ OC.Upload = { OC.Upload._hideProgressBar(); } }); - fileupload.on('fileuploaddragover', function(){ + fileupload.on('fileuploaddragover', function(e, data){ $('#app-content').addClass('file-drag'); + + var filerow = $(e.delegatedEvent.target).closest('tr'); + + if(!filerow.hasClass('dropping-to-dir')){ + $('.dropping-to-dir').removeClass('dropping-to-dir'); + } + + if(filerow.attr('data-type') === 'dir'){ + filerow.addClass('dropping-to-dir'); + } }); - fileupload.on('fileuploaddragleave fileuploaddrop', function (){ + fileupload.on('fileuploaddragleave fileuploaddrop', function (e, data){ $('#app-content').removeClass('file-drag'); + $('.dropping-to-dir').removeClass('dropping-to-dir'); }); } else { // for all browsers that don't support the progress bar diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 4b1c07b297e..3ab5032599c 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -2528,9 +2528,7 @@ return false; } - console.log(e); var dropTarget = $(e.delegatedEvent.target); - console.log(dropTarget); // check if dropped inside this container and not another one if (dropTarget.length |