summaryrefslogtreecommitdiff
path: root/plugins/kolab_files
diff options
context:
space:
mode:
authorAleksander Machniak <machniak@kolabsys.com>2014-10-22 09:51:51 (GMT)
committerAleksander Machniak <machniak@kolabsys.com>2014-10-22 09:51:51 (GMT)
commit7af77056677e3d27c6026a2bdef719e570a2b44f (patch)
tree176d11fd26b0d6f580de4f83cd10de5c4b294689 /plugins/kolab_files
parenta4ec2d2287db4264f9ba9130b9f3f51f6cc99e56 (diff)
downloadroundcubemail-plugins-kolab-7af77056677e3d27c6026a2bdef719e570a2b44f.tar.gz
Fix so Rename option is disabled when no (real) folder is selected
Diffstat (limited to 'plugins/kolab_files')
-rw-r--r--plugins/kolab_files/kolab_files.js9
-rw-r--r--plugins/kolab_files/localization/en_US.inc1
2 files changed, 4 insertions, 6 deletions
diff --git a/plugins/kolab_files/kolab_files.js b/plugins/kolab_files/kolab_files.js
index 66d2e66..7eb3600 100644
--- a/plugins/kolab_files/kolab_files.js
+++ b/plugins/kolab_files/kolab_files.js
@@ -99,8 +99,7 @@ window.rcmail && rcmail.addEventListener('init', function() {
rcmail.gui_objects.filelist.parentNode.onmousedown = function(e) { return kolab_files_click_on_list(e); };
- rcmail.enable_command('menu-open', 'menu-save', 'files-sort', 'files-search', 'files-search-reset',
- 'folder-create', 'folder-rename', true);
+ rcmail.enable_command('menu-open', 'menu-save', 'files-sort', 'files-search', 'files-search-reset', 'folder-create', true);
rcmail.file_list.init();
kolab_files_list_coltypes();
@@ -1143,14 +1142,14 @@ function kolab_files_ui()
if (is_collection) {
var found = $('#folder-collection-' + folder, list).addClass('selected');
- rcmail.enable_command('files-folder-delete', 'files-upload', false);
+ rcmail.enable_command('files-folder-delete', 'folder-rename', 'files-upload', false);
this.env.folder = null;
rcmail.command('files-list', {collection: folder});
}
else {
var found = $('#' + this.env.folders[folder].id, list).addClass('selected');
- rcmail.enable_command('files-folder-delete', 'files-upload', true);
+ rcmail.enable_command('files-folder-delete', 'folder-rename', 'files-upload', true);
this.env.folder = folder;
this.env.collection = null;
rcmail.command('files-list', {folder: folder});
@@ -1274,7 +1273,7 @@ function kolab_files_ui()
return;
this.env.folder = null;
- rcmail.enable_command('files-folder-delete', 'files-folder-rename', 'files-list', false);
+ rcmail.enable_command('files-folder-delete', 'folder-rename', 'files-list', false);
this.display_message('kolab_files.folderdeletenotice', 'confirmation');
// refresh folders list
diff --git a/plugins/kolab_files/localization/en_US.inc b/plugins/kolab_files/localization/en_US.inc
index fa15086..8d68fc8 100644
--- a/plugins/kolab_files/localization/en_US.inc
+++ b/plugins/kolab_files/localization/en_US.inc
@@ -22,7 +22,6 @@ $labels['attachsel'] = 'Attach selected';
$labels['foldercreate'] = 'Create folder';
$labels['folderedit'] = 'Edit folder';
$labels['foldermount'] = 'Add storage';
-$labels['folderrename'] = 'Rename folder';
$labels['folderdelete'] = 'Delete folder';
$labels['folderinside'] = 'Insert inside';