LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

applied comments; fix errors from merge and update NEWS file

pull/53/head
Alexandre Cloutier 2014-09-08 14:11:42 -04:00
parent 32476b16cc
commit 77c50e5232
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@ -7,7 +7,8 @@ New features
Enchancements Enchancements
- major refactoring of the GCS component saving code (dropped OGoContentStore) - 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 - 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 - 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 Bug fixes
- fixed crasher when subscribing users to resources (#2892) - fixed crasher when subscribing users to resources (#2892)

26
UI/WebServerResources/MailerUI.js
View File

@ -31,7 +31,7 @@ var pageContent = $("pageContent");
var deleteMessageRequestCount = 0; var deleteMessageRequestCount = 0;
var refreshViewCheckTimer; var messageCheckTimer;
/* We need to override this method since it is adapted to GCS-based folder /* We need to override this method since it is adapted to GCS-based folder
references, which we do not use here */ references, which we do not use here */
@ -1969,7 +1969,7 @@ function initMailer(event) {
configureMessageListEvents(); configureMessageListEvents();
initMailboxTree(); initMailboxTree();
initRefreshViewCheckTimer(); initMessageCheckTimer();
Event.observe(document, "keydown", onDocumentKeydown); Event.observe(document, "keydown", onDocumentKeydown);
@ -1989,27 +1989,23 @@ function initMailer(event) {
Event.observe(window, "resize", onWindowResize); Event.observe(window, "resize", onWindowResize);
} }
function initRefreshViewCheckTimer() { function initMessageCheckTimer() {
// TEMPORARY : to be erase var messageCheck = UserDefaults["SOGoMailMessageCheck"];
var refreshViewCheck = UserDefaults["SOGoMailMessageCheck"]; if (messageCheck && messageCheck != "manually") {
if (refreshViewCheck == null)
refreshViewCheck = UserDefaults["SOGoRefreshViewCheck"];
if (refreshViewCheck && refreshViewCheck != "manually") {
var interval; var interval;
if (refreshViewCheck == "once_per_hour") if (messageCheck == "once_per_hour")
interval = 3600; interval = 3600;
else if (refreshViewCheck == "every_minute") else if (messageCheck == "every_minute")
interval = 60; interval = 60;
else { else {
interval = parseInt(refreshViewCheck.substr(6)) * 60; interval = parseInt(messageCheck.substr(6)) * 60;
} }
refreshViewCheckTimer = window.setInterval(onRefreshViewCheckCallback, messageCheckTimer = window.setInterval(onMessageCheckCallback,
interval * 1000); interval * 1000);
} }
} }
function onRefreshViewCheckCallback(event) { function onMessageCheckCallback(event) {
refreshMailbox(); refreshMailbox();
} }