plugins/kolab_files

[Aleksander Machniak]

 plugins/kolab_files/kolab_files.js         |    9 ++++-----
 plugins/kolab_files/localization/en_US.inc |    1 -
 2 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 7af77056677e3d27c6026a2bdef719e570a2b44f
Author: Aleksander Machniak <machniak at kolabsys.com>
Date:   Wed Oct 22 05:51:51 2014 -0400

    Fix so Rename option is disabled when no (real) folder is selected

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';