diff options
| author | Tom Needham <needham.thomas@gmail.com> | 2012-01-01 00:47:24 +0000 |
|---|---|---|
| committer | Tom Needham <needham.thomas@gmail.com> | 2012-01-01 00:47:24 +0000 |
| commit | 2c4ab355ac3ace893cc06c645d4a8d25a63dbdc1 (patch) | |
| tree | b78f84efb75d77c618db7451a65e2a7dfadbe91b /files | |
| parent | 5a5b216ba0c2d58352364b9fc908f6547989ef72 (diff) | |
| download | nextcloud-server-2c4ab355ac3ace893cc06c645d4a8d25a63dbdc1.tar.gz nextcloud-server-2c4ab355ac3ace893cc06c645d4a8d25a63dbdc1.zip | |
Shared folder no longer draggable or droppable
Diffstat (limited to 'files')
| -rw-r--r-- | files/js/files.js | 8 |
1 files changed, 5 insertions, 3 deletions
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); |