Monotone-Parent: d07959b964a2582bf5674d383b0dac7303346571

Monotone-Revision: 0bf13271077dfd22aaca8a2663fe7490f9d84cb3

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-02-01T15:49:33
Monotone-Branch: ca.inverse.sogo

UI/WebServerResources/MailerUI.js

@@ -179,7 +179,6 @@ function mailListMarkMessage(event) {
 }
 
 function mailListMarkMessageCallback(http) {
-  if (http.readyState == 4)
   if (isHttpStatus204(http.status)) {
     var data = http.callbackData;
     markMailInWindow(data["window"], data["msguid"], data["markread"]);
@@ -235,7 +234,6 @@ function deleteSelectedMessages(sender) {
 }
 
 function deleteSelectedMessagesCallback(http) {
-  if (http.readyState == 4) {
   if (isHttpStatus204(http.status)) {
     var data = http.callbackData;
     deleteCachedMessage(data["messageId"]);
@@ -263,7 +261,6 @@ function deleteSelectedMessagesCallback(http) {
       }
     }
   }
-  }
   else
     log ("deleteSelectedMessagesCallback: problem during ajax request " + http.status);
 }
@@ -488,8 +485,7 @@ function openMailbox(mailbox, reload, idx) {
 			   currentMessage);
 
     var quotasUrl = ApplicationBaseURL + mailbox + "/quotas";
-    document.quotasAjaxRequest
+    triggerAjaxRequest(quotasUrl, quotasCallback);
-      = triggerAjaxRequest(quotasUrl, quotasCallback);
   }
 }
 
@@ -503,8 +499,7 @@ function messageListCallback(http) {
   var div = $('mailboxContent');
   var table = $('messageList');
   
-  if (http.readyState == 4
+  if (http.status == 200) {
-      && http.status == 200) {
     document.messageListAjaxRequest = null;
 
     if (table) {
@@ -571,8 +566,7 @@ function messageListCallback(http) {
 }
 
 function quotasCallback(http) {
-  if (http.readyState == 4
+  if (http.status == 200) {
-      && http.status == 200) {
     var hasQuotas = false;
 
     if (http.responseText.length > 0) {
@@ -822,7 +816,6 @@ function onICalendarButtonClick(event) {
 }
 
 function ICalendarButtonCallback(http) {
-  if (http.readyState == 4)
   if (isHttpStatus204(http.status)) {
     var oldMsg = http.callbackData;
     var msg = Mailer.currentMailbox + "/" + Mailer.currentMessages[Mailer.currentMailbox];
@@ -831,10 +824,9 @@ function ICalendarButtonCallback(http) {
       loadMessage(Mailer.currentMessages[Mailer.currentMailbox]);
     }
   }
-    else {
+  else
     window.alert("received code: " + http.status);
 }
-}
 
 function resizeMailContent() {
   var headerTable = document.getElementsByClassName('mailer_fieldtable')[0];
@@ -878,8 +870,7 @@ function onImageClick(event) {
 function messageCallback(http) {
   var div = $('messageContent');
 
-  if (http.readyState == 4
+  if (http.status == 200) {
-      && http.status == 200) {
     document.messageAjaxRequest = null;
     div.update(http.responseText);
     configureLinksInMessage();
@@ -1418,8 +1409,7 @@ function updateMailboxMenus() {
 }
 
 function onLoadMailboxesCallback(http) {
-  if (http.readyState == 4
+  if (http.status == 200) {
-      && http.status == 200) {
     checkAjaxRequestsState();
     if (http.responseText.length > 0) {
       var newAccount = buildMailboxes(http.callbackData,
@@ -1489,8 +1479,7 @@ function getFoldersState() {
 }
 
 function getFoldersStateCallback(http) {
-  if (http.readyState == 4
+  if (http.status == 200) {
-      && http.status == 200) {
     if (http.responseText.length > 0) {
       // The response text is a JSOn representation
       // of the folders that were left opened.
@@ -1501,9 +1490,9 @@ function getFoldersStateCallback(http) {
 	  mailboxTree.o(i);
       }
     }
-  }
     mailboxTree.autoSync();
   }
+}
 
 function saveFoldersState() {
   if (mailAccounts.length > 0) {
@@ -1514,8 +1503,7 @@ function saveFoldersState() {
 }
 
 function saveFoldersStateCallback(http) {
-  if (http.readyState == 4
+  if (isHttpStatus204(http.status)) {
-      && isHttpStatus204(http.status)) {
     log ("folders state saved");
   }
 }

UI/WebServerResources/UIxAttendeesEditor.js

@@ -322,7 +322,8 @@ function displayFreeBusyForNode(input) {
       }
       var sd = $('startTime_date').valueAsShortDateString();
       var ed = $('endTime_date').valueAsShortDateString();
-      var urlstr = ( UserFolderURL + "../" + input.uid + "/freebusy.ifb/ajaxRead?"
+      var urlstr = ( UserFolderURL + "../" + input.uid
+		     + "/freebusy.ifb/ajaxRead?"
 		     + "sday=" + sd + "&eday=" + ed + "&additional=" +
 		     additionalDays );
       document.contactFreeBusyAjaxRequest
@@ -601,7 +602,8 @@ function prepareAttendees() {
 	 $(row).addClassName(attendeesEditor.states[i]);
 	 var input = $(row).down("input");
 	 var value = "";
-	 if (attendeesEditor.names[i].length > 0 && attendeesEditor.names[i] != attendeesEditor.emails[i])
+	 if (attendeesEditor.names[i].length > 0
+	     && attendeesEditor.names[i] != attendeesEditor.emails[i])
 	    value += attendeesEditor.names[i] + " ";
 	 value += "<" + attendeesEditor.emails[i] + ">";
 	 input.value = value;

UI/WebServerResources/generic.js

@@ -309,39 +309,47 @@ function appendDifferentiator(url) {
   return url_nocache;
 }
 
+function onAjaxRequestStateChange(http) {
+  try {
+    if (http.readyState == 4
+	&& activeAjaxRequests > 0) {
+      if (!http.aborted)
+	http.callback(http);
+      activeAjaxRequests--;
+      checkAjaxRequestsState();
+      http.onreadystatechange = Prototype.emptyFunction;
+      http.callback = Prototype.emptyFunction;
+      http.callbackData = null;
+    }
+  }
+  catch (e) {
+    activeAjaxRequests--;
+    checkAjaxRequestsState();
+    http.onreadystatechange = Prototype.emptyFunction;
+    http.callback = Prototype.emptyFunction;
+    http.callbackData = null;
+    log("AJAX Request, Caught Exception: " + e.name);
+    log(e.message);
+    log(backtrace());
+  }
+}
+
 function triggerAjaxRequest(url, callback, userdata, content, headers) {
   var http = createHTTPClient();
 
-  activeAjaxRequests += 1;
+  activeAjaxRequests++;
-  document.animTimer = setTimeout("checkAjaxRequestsState();", 50);
+  document.animTimer = setTimeout("checkAjaxRequestsState();", 250);
   //url = appendDifferentiator(url);
 
   if (http) {
     http.open("POST", url, true);
     http.url = url;
-    http.onreadystatechange
+    http.callback = callback;
-      = function() {
-//       log ("state changed (" + http.readyState + "): " + url);
-      try {
-	if (http.readyState == 4
-	    && activeAjaxRequests > 0) {
-	  if (!http.aborted) {
-	    if (userdata)
     http.callbackData = userdata;
-	    callback(http);
+    http.onreadystatechange = function() { onAjaxRequestStateChange(http) };
-	  }
+//       = function() {
-	  activeAjaxRequests -= 1;
+// //       log ("state changed (" + http.readyState + "): " + url);
-	  checkAjaxRequestsState();
+//     };
-	}
-      }
-      catch (e) {
-	activeAjaxRequests -= 1;
-	checkAjaxRequestsState();
-	log("AJAX Request, Caught Exception: " + e.name);
-	log(e.message);
-	log(backtrace());
-      }
-    };
     var hasContentLength = false;
     if (headers) {
       for (var i in headers) {
@@ -367,36 +375,31 @@ function triggerAjaxRequest(url, callback, userdata, content, headers) {
 
 function startAnimation(parent, nextNode) {
   var anim = $("progressIndicator");
-  if (anim) return anim;
+  if (!anim) {
-  
+    anim = createElement("img", "progressIndicator", null,
-  anim = document.createElement("img");
+			 {src: ResourcesURL + "/busy.gif"});
-  anim = $(anim);
-  anim.id = "progressIndicator";
-  anim.src = ResourcesURL + "/busy.gif";
     anim.setStyle({ visibility: "hidden" });
     if (nextNode)
       parent.insertBefore(anim, nextNode);
     else
       parent.appendChild(anim);
     anim.setStyle({ visibility: "visible" });
+  }
 
   return anim;
 }
 
 function checkAjaxRequestsState() {
-  var toolbar = document.getElementById("toolbar");
+  var progressImage = $("progressIndicator");
-  if (toolbar) {
   if (activeAjaxRequests > 0
-        && !document.busyAnim) {
+      && !progressImage) {
-      document.busyAnim = startAnimation(toolbar);
+    var toolbar = $("toolbar");
-    }
+    if (toolbar)
-    else if (activeAjaxRequests == 0
+      startAnimation(toolbar);
-	     && document.busyAnim
-	     && document.busyAnim.parentNode) {
-      document.busyAnim.parentNode.removeChild(document.busyAnim);
-      document.busyAnim = null;
-    }
   }
+  else if (!activeAjaxRequests
+	   && progressImage)
+    progressImage.parentNode.removeChild(progressImage);
 }
 
 function isSafari3() {