Drive/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix folder pre-selection in Files on page refresh, not fully done in 516768726a

Browse source
This commit is contained in:
Aleksander Machniak 2017-05-16 12:36:57 +02:00
parent fdcb5c0c58
commit 6a3adfd448
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
plugins/kolab_files/kolab_files.js
View file

@ -193,8 +193,8 @@ function kolab_files_init()
file_api.request('folder_info', {folder: file_api.file_path(rcmail.env.file), sessions: 1}, 'folder_info_response'); file_api.request('folder_info', {folder: file_api.file_path(rcmail.env.file), sessions: 1}, 'folder_info_response');
} }
else { else {
file_api.env.folder = rcmail.env.folder; file_api.env.init_folder = rcmail.env.folder;
file_api.env.collection = rcmail.env.collection; file_api.env.init_collection = rcmail.env.collection;
file_api.folder_list(); file_api.folder_list();
file_api.browser_capabilities_check(); file_api.browser_capabilities_check();
} }
@ -1973,7 +1973,7 @@ function kolab_files_ui()
if (!this.response(response)) if (!this.response(response))
return; return;
var first, body, rows = [], var folder, first, body, rows = [],
list_selector = rcmail.env.folder_list_selector || '#files-folder-list', list_selector = rcmail.env.folder_list_selector || '#files-folder-list',
search_selector = rcmail.env.folder_search_selector || '#foldersearch', search_selector = rcmail.env.folder_search_selector || '#foldersearch',
elem = $(list_selector), elem = $(list_selector),
@ -2060,13 +2060,21 @@ function kolab_files_ui()
file_api.folder_select(node.id); file_api.folder_select(node.id);
}); });
// select first folder? // select first/current folder
if (response.result.auth_errors && response.result.auth_errors.length) if (response.result.auth_errors && response.result.auth_errors.length)
this.env.folder = this.env.collection = null; this.env.folder = this.env.collection = null;
else if (this.env.folder) else if (this.env.folder)
rcmail.folder_list.select(this.env.folder); rcmail.folder_list.select(folder);
else if (this.env.collection) else if (this.env.collection)
rcmail.folder_list.select('folder-collection-' + this.env.collection); rcmail.folder_list.select('folder-collection-' + this.env.collection);
else if (folder = this.env.init_folder) {
this.env.init_folder = null;
rcmail.folder_list.select(folder);
}
else if (folder = this.env.init_collection) {
this.env.init_collection = null;
rcmail.folder_list.select('folder-collection-' + folder);
}
else if (first) else if (first)
rcmail.folder_list.select(first); rcmail.folder_list.select(first);