aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Jobst <mjobst@necls.com>2016-11-05 20:29:56 +0100
committerMorris Jobke <hey@morrisjobke.de>2016-11-14 15:35:25 +0100
commit03cbc7217c82f08cbf59b9984639fda5317e31e9 (patch)
treebac414d50bd9f861ecf48c391cce7c936bd16e56
parentcebb68992509215163f6776b76e48411a31a287e (diff)
downloadnextcloud-server-03cbc7217c82f08cbf59b9984639fda5317e31e9.tar.gz
nextcloud-server-03cbc7217c82f08cbf59b9984639fda5317e31e9.zip
disabling dropping on dragging objects temporarily
better solution
-rw-r--r--apps/files/js/files.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 1681e2c7e48..99f888ce0f7 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -379,14 +379,19 @@ var dragOptions={
$selectedFiles = $(this);
}
$selectedFiles.closest('tr').addClass('animate-opacity dragging');
+ $selectedFiles.closest('tr').filter('.ui-droppable').droppable( 'disable' );
+
},
stop: function(event, ui) {
var $selectedFiles = $('td.filename input:checkbox:checked');
if (!$selectedFiles.length) {
$selectedFiles = $(this);
}
+
var $tr = $selectedFiles.closest('tr');
$tr.removeClass('dragging');
+ $tr.filter('.ui-droppable').droppable( 'enable' );
+
setTimeout(function() {
$tr.removeClass('animate-opacity');
}, 300);
@@ -454,4 +459,3 @@ function fileDownloadPath(dir, file) {
// for backward compatibility
window.Files = OCA.Files.Files;
-