Fix so Rename option is disabled when no (real) folder is selected
This commit is contained in:
parent
a4ec2d2287
commit
7af7705667
2 changed files with 4 additions and 6 deletions
|
@ -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.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',
|
rcmail.enable_command('menu-open', 'menu-save', 'files-sort', 'files-search', 'files-search-reset', 'folder-create', true);
|
||||||
'folder-create', 'folder-rename', true);
|
|
||||||
|
|
||||||
rcmail.file_list.init();
|
rcmail.file_list.init();
|
||||||
kolab_files_list_coltypes();
|
kolab_files_list_coltypes();
|
||||||
|
@ -1143,14 +1142,14 @@ function kolab_files_ui()
|
||||||
if (is_collection) {
|
if (is_collection) {
|
||||||
var found = $('#folder-collection-' + folder, list).addClass('selected');
|
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;
|
this.env.folder = null;
|
||||||
rcmail.command('files-list', {collection: folder});
|
rcmail.command('files-list', {collection: folder});
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
var found = $('#' + this.env.folders[folder].id, list).addClass('selected');
|
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.folder = folder;
|
||||||
this.env.collection = null;
|
this.env.collection = null;
|
||||||
rcmail.command('files-list', {folder: folder});
|
rcmail.command('files-list', {folder: folder});
|
||||||
|
@ -1274,7 +1273,7 @@ function kolab_files_ui()
|
||||||
return;
|
return;
|
||||||
|
|
||||||
this.env.folder = null;
|
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');
|
this.display_message('kolab_files.folderdeletenotice', 'confirmation');
|
||||||
|
|
||||||
// refresh folders list
|
// refresh folders list
|
||||||
|
|
|
@ -22,7 +22,6 @@ $labels['attachsel'] = 'Attach selected';
|
||||||
$labels['foldercreate'] = 'Create folder';
|
$labels['foldercreate'] = 'Create folder';
|
||||||
$labels['folderedit'] = 'Edit folder';
|
$labels['folderedit'] = 'Edit folder';
|
||||||
$labels['foldermount'] = 'Add storage';
|
$labels['foldermount'] = 'Add storage';
|
||||||
$labels['folderrename'] = 'Rename folder';
|
|
||||||
$labels['folderdelete'] = 'Delete folder';
|
$labels['folderdelete'] = 'Delete folder';
|
||||||
|
|
||||||
$labels['folderinside'] = 'Insert inside';
|
$labels['folderinside'] = 'Insert inside';
|
||||||
|
|
Loading…
Add table
Reference in a new issue