amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-07-14 21:04:53 +00:00
Code Issues Projects Releases Wiki Activity

applied comments and fix bug where the folded threads were saved only after refreshing the entire page

Browse Source
This commit is contained in:
Alexandre Cloutier
2014-09-09 13:51:02 -04:00
parent c5f9dd086b
commit 59023da7f0
2 changed files with 52 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/WebServerResources/MailerUI.js
+18 -6
View File
@@ -248,17 +248,28 @@ function mailListToggleMessageThread(row, cell) {
// Update the dictionnary of the collapsed threads
var mailbox = Mailer.currentMailbox;
var url = ApplicationBaseURL + encodeURI(mailbox) + "/" + msguid + "/" + action;
var data = { "currentMailbox": Mailer.currentMailbox, "msguid": msguid };
var callbackData = { "currentMailbox": Mailer.currentMailbox, "msguid": msguid, "action": action};
triggerAjaxRequest(url, mailListToggleMessageCollapseCallback);
triggerAjaxRequest(url, mailListToggleMessageCollapseCallback, callbackData);
}
function mailListToggleMessageCollapseCallback(http) {
var data = http.callbackData;
if (!isHttpStatus204(http.status)) {
if (isHttpStatus204(http.status)) {
if (data.action == "markMessageCollapse") {
if (cachedThreadsCollapsed[data.currentMailbox])
cachedThreadsCollapsed[data.currentMailbox].push(data.msguid);
else
cachedThreadsCollapsed[data.currentMailbox] = [data.msguid];
}
else {
var index = cachedThreadsCollapsed[data.currentMailbox].indexOf(data.msguid);
cachedThreadsCollapsed[data.currentMailbox].splice(index, 1);
}
}
else {
log("Message Collapse Failed (" + http.status + "): " + http.statusText);
}
//Mailer.dataTable.invalidate(data["msguid"], true);
}
@@ -948,6 +959,7 @@ function openMailbox(mailbox, reload) {
* Called from SOGoDataTable.render()
*/
var show = false;
var cachedThreadsCollapsed = UserSettings.Mail.threadsCollapsed;
function messageListCallback(row, data, isNew) {
var currentMessage = Mailer.currentMessages[Mailer.currentMailbox];
@@ -961,9 +973,9 @@ function messageListCallback(row, data, isNew) {
row.addClassName('_selected');
if (data['Thread']) {
if (UserSettings.Mail.threadsCollapsed) {
if (cachedThreadsCollapsed) {
var mailbox = Mailer.currentMailbox;
var collapsedList = UserSettings.Mail.threadsCollapsed[mailbox];
var collapsedList = cachedThreadsCollapsed[mailbox];
if (collapsedList != undefined && collapsedList.indexOf(row.id.split("_")[1]) != -1) {
row.addClassName('closedThread');
show = true;