Shared folder no longer draggable or droppable

diff --git a/files/js/files.js b/files/js/files.js
index 53437453ff9fd94a03b150454a72f10135dafea5..8df7aa353575f874f3a8ab73d3f10a5d82a9ca0f 100644 (file)
--- 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);