diff options
| author | Marius Blüm <marius@lineone.io> | 2016-06-15 17:36:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-15 17:36:16 +0200 |
| commit | d9be370b861c324ca74ca5f4777caf08840a4377 (patch) | |
| tree | ca2422ad1c2692030239b4ed810342021f0a0e73 /apps/files/js/file-upload.js | |
| parent | e8e70af10459104e74aeef663ee8becc7ce69ded (diff) | |
| parent | 10f8d643dc44ddf82db3cfd91d529d47cfe2d94d (diff) | |
| download | nextcloud-server-d9be370b861c324ca74ca5f4777caf08840a4377.tar.gz nextcloud-server-d9be370b861c324ca74ca5f4777caf08840a4377.zip | |
Merge pull request #83 from nextcloud/file-drop-highlight
File drop highlight
Diffstat (limited to 'apps/files/js/file-upload.js')
| -rw-r--r-- | apps/files/js/file-upload.js | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index 3257ded7b89..2453cc5207c 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -273,7 +273,7 @@ OC.Upload = { var self = this; if ( $('#file_upload_start').exists() ) { var file_upload_param = { - dropZone: $('#content'), // restrict dropZone to content div + dropZone: $('#app-content'), // restrict dropZone to app-content div pasteZone: null, autoUpload: false, sequentialUploads: true, @@ -494,7 +494,7 @@ OC.Upload = { * @param {object} e * @param {object} data */ - done:function(e, data) { + done: function(e, data) { OC.Upload.log('done', e, data); // handle different responses (json or body from iframe for ie) var response; @@ -667,7 +667,29 @@ OC.Upload = { OC.Upload._hideProgressBar(); } }); + fileupload.on('fileuploaddragover', function(e){ + $('#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'); + $('.dir-drop').removeClass('dir-drop'); + $('.icon-filetype-folder-drag-accept').removeClass('icon-filetype-folder-drag-accept'); + } + + if(filerow.attr('data-type') === 'dir'){ + $('#app-content').addClass('dir-drop'); + filerow.addClass('dropping-to-dir'); + filerow.find('.thumbnail').addClass('icon-filetype-folder-drag-accept'); + } + }); + fileupload.on('fileuploaddragleave fileuploaddrop', function (){ + $('#app-content').removeClass('file-drag'); + $('.dropping-to-dir').removeClass('dropping-to-dir'); + $('.dir-drop').removeClass('dir-drop'); + $('.icon-filetype-folder-drag-accept').removeClass('icon-filetype-folder-drag-accept'); + }); } else { // for all browsers that don't support the progress bar // IE 8 & 9 |