From 77c50e523250ccdceafa3fe1b1a3439e630a407e Mon Sep 17 00:00:00 2001
From: Alexandre Cloutier <acloutier@inverse.ca>
Date: Mon, 8 Sep 2014 14:11:42 -0400
Subject: [PATCH] applied comments; fix errors from merge and update NEWS file

---
 NEWS                              |  3 ++-
 UI/WebServerResources/MailerUI.js | 26 +++++++++++---------------
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/NEWS b/NEWS
index 46eb20152..a490fc467 100644
--- a/NEWS
+++ b/NEWS
@@ -7,7 +7,8 @@ New features
 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  
+ - 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)
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 67735a16b..57f210fd7 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -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,
-                                                  interval * 1000);
+        messageCheckTimer = window.setInterval(onMessageCheckCallback,
+                                               interval * 1000);
     }
 }
 
-function onRefreshViewCheckCallback(event) {
+function onMessageCheckCallback(event) {
     refreshMailbox();
 }