summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWilliam Bargent <personal@williambargent.co.uk>2016-06-23 11:56:40 +0100
committerGitHub <noreply@github.com>2016-06-23 11:56:40 +0100
commit3f2b3a3aaba0878d3322c28167e27132d8c4e27b (patch)
tree00f8b3267f779e3152a533e895f943111f0546e2
parent77c11758945f863e9bbf91a2e08952ea6999c237 (diff)
parent0552933770501061ba34f72955176a2f0ecd3f46 (diff)
downloadnextcloud-server-3f2b3a3aaba0878d3322c28167e27132d8c4e27b.tar.gz
nextcloud-server-3f2b3a3aaba0878d3322c28167e27132d8c4e27b.zip
Merge pull request #208 from nextcloud/drag-accept-icon-for-emptycontent
changes emptycontent icon to drag-accept on file-drag
-rw-r--r--apps/files/js/file-upload.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js
index 2453cc5207c..d5470d0be55 100644
--- a/apps/files/js/file-upload.js
+++ b/apps/files/js/file-upload.js
@@ -669,13 +669,14 @@ OC.Upload = {
});
fileupload.on('fileuploaddragover', function(e){
$('#app-content').addClass('file-drag');
+ $('#emptycontent .icon-folder').addClass('icon-filetype-folder-drag-accept');
var filerow = $(e.delegatedEvent.target).closest('tr');
if(!filerow.hasClass('dropping-to-dir')){
+ $('.dropping-to-dir .icon-filetype-folder-drag-accept').removeClass('icon-filetype-folder-drag-accept');
$('.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'){