diff options
| author | Robin Appelman <icewind1991@gmail.com> | 2011-12-11 22:00:17 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind1991@gmail.com> | 2011-12-11 22:00:17 +0100 |
| commit | 7f1bb5fd780f88e3765046af6777e5420d14829d (patch) | |
| tree | 6e12d080bc82dababf11017bb46faae565013127 /files/js/files.js | |
| parent | 98dc0882cbba43e892d2a5a7bf015d0218e026cb (diff) | |
| parent | a0548a416a56f6e0fd3269279777d57156c47d15 (diff) | |
| download | nextcloud-server-7f1bb5fd780f88e3765046af6777e5420d14829d.tar.gz nextcloud-server-7f1bb5fd780f88e3765046af6777e5420d14829d.zip | |
Merge branch 'master' into database
Diffstat (limited to 'files/js/files.js')
| -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 4eaa098241b..5a528f5122c 100644 --- a/files/js/files.js +++ b/files/js/files.js @@ -14,8 +14,8 @@ $(document).ready(function() { $('#fileList tr td.filename').draggable(dragOptions); $('#fileList tr[data-type="dir"] td.filename').droppable(folderDropOptions); $('div.crumb').droppable(crumbDropOptions); - $('#plugins>ul>li:first-child').data('dir',''); - $('#plugins>ul>li:first-child').droppable(crumbDropOptions); + $('ul#apps>li:first-child').data('dir',''); + $('ul#apps>li:first-child').droppable(crumbDropOptions); // Triggers invisible file input $('.file_upload_button_wrapper').live('click', function() { @@ -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); |