aboutsummaryrefslogtreecommitdiffstats
path: root/files/js/files.js
diff options
context:
space:
mode:
Diffstat (limited to 'files/js/files.js')
-rw-r--r--files/js/files.js8
1 files changed, 5 insertions, 3 deletions
diff --git a/files/js/files.js b/files/js/files.js
index 3e1bffccca5..b500ecfed70 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);