applied comments; fix errors from merge and update NEWS file
parent
32476b16cc
commit
77c50e5232
1
NEWS
1
NEWS
|
@ -8,6 +8,7 @@ Enchancements
|
|||
- major refactoring of the GCS component saving code (dropped OGoContentStore)
|
||||
- printing calendars in colors is now possible in all views; list, daily, weekly and multicolumns
|
||||
- new option to print calendars events and tasks with a background color or with a border color
|
||||
- labels tagging only make one AJAX call for all the selected messages instead of one AJAX call per message
|
||||
|
||||
Bug fixes
|
||||
- fixed crasher when subscribing users to resources (#2892)
|
||||
|
|
|
@ -31,7 +31,7 @@ var pageContent = $("pageContent");
|
|||
|
||||
var deleteMessageRequestCount = 0;
|
||||
|
||||
var refreshViewCheckTimer;
|
||||
var messageCheckTimer;
|
||||
|
||||
/* We need to override this method since it is adapted to GCS-based folder
|
||||
references, which we do not use here */
|
||||
|
@ -1969,7 +1969,7 @@ function initMailer(event) {
|
|||
configureMessageListEvents();
|
||||
|
||||
initMailboxTree();
|
||||
initRefreshViewCheckTimer();
|
||||
initMessageCheckTimer();
|
||||
|
||||
Event.observe(document, "keydown", onDocumentKeydown);
|
||||
|
||||
|
@ -1989,27 +1989,23 @@ function initMailer(event) {
|
|||
Event.observe(window, "resize", onWindowResize);
|
||||
}
|
||||
|
||||
function initRefreshViewCheckTimer() {
|
||||
// TEMPORARY : to be erase
|
||||
var refreshViewCheck = UserDefaults["SOGoMailMessageCheck"];
|
||||
if (refreshViewCheck == null)
|
||||
refreshViewCheck = UserDefaults["SOGoRefreshViewCheck"];
|
||||
|
||||
if (refreshViewCheck && refreshViewCheck != "manually") {
|
||||
function initMessageCheckTimer() {
|
||||
var messageCheck = UserDefaults["SOGoMailMessageCheck"];
|
||||
if (messageCheck && messageCheck != "manually") {
|
||||
var interval;
|
||||
if (refreshViewCheck == "once_per_hour")
|
||||
if (messageCheck == "once_per_hour")
|
||||
interval = 3600;
|
||||
else if (refreshViewCheck == "every_minute")
|
||||
else if (messageCheck == "every_minute")
|
||||
interval = 60;
|
||||
else {
|
||||
interval = parseInt(refreshViewCheck.substr(6)) * 60;
|
||||
interval = parseInt(messageCheck.substr(6)) * 60;
|
||||
}
|
||||
refreshViewCheckTimer = window.setInterval(onRefreshViewCheckCallback,
|
||||
messageCheckTimer = window.setInterval(onMessageCheckCallback,
|
||||
interval * 1000);
|
||||
}
|
||||
}
|
||||
|
||||
function onRefreshViewCheckCallback(event) {
|
||||
function onMessageCheckCallback(event) {
|
||||
refreshMailbox();
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue