From: Tom Needham <needham.thomas@gmail.com>
Date: Sun, 1 Jan 2012 00:47:24 +0000 (+0000)
Subject: Shared folder no longer draggable or droppable
X-Git-Tag: v3.0~64^2~13
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=2c4ab355ac3ace893cc06c645d4a8d25a63dbdc1;p=nextcloud-server.git

Shared folder no longer draggable or droppable
---

diff --git a/files/js/files.js b/files/js/files.js
index 53437453ff9..8df7aa35357 100644
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -11,8 +11,8 @@ $(document).ready(function() {
 	$('#file_action_panel').attr('activeAction', false);
 
 	//drag/drop of files
-	$('#fileList tr td.filename').draggable(dragOptions);
-	$('#fileList tr[data-type="dir"] td.filename').droppable(folderDropOptions);
+	$('#fileList tr[data-file!=Shared] td.filename').draggable(dragOptions);
+	$('#fileList tr[data-type="dir"][data-file!=Shared] td.filename').droppable(folderDropOptions);
 	$('div.crumb').droppable(crumbDropOptions);
 	$('ul#apps>li:first-child').data('dir','');
 	$('ul#apps>li:first-child').droppable(crumbDropOptions);
@@ -70,7 +70,9 @@ $(document).ready(function() {
 			procesSelection();
 		} else {
 			var filename=$(this).parent().parent().attr('data-file');
-			if(!FileList.isLoading(filename)){
+			var tr=$('tr').filterAttr('data-file',filename);
+			var renaming=tr.data('renaming')
+				if(!renaming && !FileList.isLoading(filename)){
 				var mime=$(this).parent().parent().data('mime');
 				var type=$(this).parent().parent().data('type');
 				var action=FileActions.getDefault(mime,type);