Monotone-Parent: 7f6095f809b62253c184355dc35939b4fe3e2c53

Monotone-Revision: 45efb9e03119e3b3a03e6e1b4b2e0c17f37a7928

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2007-10-23T14:39:29
Monotone-Branch: ca.inverse.sogo

UI/WebServerResources/SchedulerUI.js

@@ -1410,15 +1410,22 @@ function onCalendarAdd(event) {
   preventDefault(event);
 }
 
-function appendCalendar(folderName, folder) {
+function appendCalendar(folderName, folderPath) {
-  if (folder)
+  var owner;
-    folder = accessToSubscribedFolder(folder);
+
+  if (folderPath) {
+    owner = getSubscribedFolderOwner(folderPath);
+    folderPath = accessToSubscribedFolder(folderPath);
+  }
   else
-    folder = "/" + folderName;
+    folderPath = "/" + folderName;
 
-//   log ("append: " + folderName + "; folder: " + folder);
+  if (!owner)
+    owner = UserLogin;
 
-  if ($(folder))
+  //log ("append name: " + folderName + "; path: " + folderPath + "; owner: " + owner);
+
+  if ($(folderPath))
     window.alert(clabels["You have already subscribed to that folder!"]);
   else {
     var calendarList = $("calendarList");
@@ -1427,8 +1434,34 @@ function appendCalendar(folderName, folder) {
     //log ("color: " + color);
 
     var li = document.createElement("li");
-    calendarList.appendChild(li);
+    
-    li.setAttribute("id", folder);
+    // Add the calendar to the proper place
+    for (var i = 0; i < lis.length; i++) {
+      var currentFolderName = lis[i].lastChild.nodeValue.strip();
+      if (lis[i].readAttribute('owner') != owner)
+	continue;
+      if (currentFolderName > folderName)
+	break;
+    }
+    if (i != lis.length) { // User is subscribed to other calendars of the same owner
+      calendarList.insertBefore(li, lis[i]);
+    }
+    else {
+      for (var i = 0; i < lis.length; i++) {
+	if (lis[i].readAttribute('owner') == UserLogin)
+	  continue;
+	if (lis[i].readAttribute('owner') > owner) {
+	  calendarList.insertBefore(li, lis[i]);
+	  break;
+	}
+      }
+      if (i == lis.length) {
+	calendarList.appendChild(li);
+      }
+    }
+
+    li.setAttribute("id", folderPath);
+    li.setAttribute("owner", owner);
 
     var checkBox = document.createElement("input");
     checkBox.setAttribute("type", "checkbox");
@@ -1453,20 +1486,21 @@ function appendCalendar(folderName, folder) {
     Event.observe(checkBox, "click",
 		  updateCalendarStatus.bindAsEventListener(checkBox));
 
-    var url = URLForFolderID(folder) + "/canAccessContent";
+    var url = URLForFolderID(folderPath) + "/canAccessContent";
-    triggerAjaxRequest(url, calendarEntryCallback, folder);
+    triggerAjaxRequest(url, calendarEntryCallback, folderPath);
     
+    // Update CSS for events color
     if (!document.styleSheets) return;
     var theRules = new Array();
     var lastSheet = document.styleSheets[document.styleSheets.length - 1];
     if (lastSheet.insertRule) { // Mozilla
-      lastSheet.insertRule('.calendarFolder' + folder.substr(1) + ' {'
+      lastSheet.insertRule('.calendarFolder' + folderPath.substr(1) + ' {'
 			   + ' background-color: '
 			   + color
 			   + ' !important; }', 0);
     }
     else { // IE
-      lastSheet.addRule('.calendarFolder' + folder.substr(1),
+      lastSheet.addRule('.calendarFolder' + folderPath.substr(1),
 			' background-color: '
 			+ color
 			+ ' !important; }');
@@ -1483,26 +1517,30 @@ function onFolderSubscribeCB(folderData) {
 function onFolderUnsubscribeCB(folderId) {
   var node = $(folderId);
   node.parentNode.removeChild(node);
-  refreshEvents();
+  if (removeFolderRequestCount == 0) {
-  refreshTasks();
+    refreshEvents();
-  changeCalendarDisplay();
+    refreshTasks();
+    changeCalendarDisplay();
+  }
 }
 
 function onCalendarRemove(event) {
-  var nodes = $("calendarList").getSelectedNodes();
+  if (removeFolderRequestCount == 0) {
-  if (nodes.length > 0) { 
+    var nodes = $("calendarList").getSelectedNodes();
-     nodes[0].deselect();
+    for (var i = 0; i < nodes.length; i++) {
-     var folderId = nodes[0].getAttribute("id");
+      nodes[i].deselect();
-     var folderIdElements = folderId.split("_");
+      var folderId = nodes[i].getAttribute("id");
-     if (folderIdElements.length > 1) {
+      var folderIdElements = folderId.split("_");
-       unsubscribeFromFolder(folderId, onFolderUnsubscribeCB, folderId);
+      if (folderIdElements.length > 1) {
-     }
+	unsubscribeFromFolder(folderId, onFolderUnsubscribeCB, folderId);
-     else {
+      }
-       var calId = folderIdElements[0].substr(1);
+      else {
-       deletePersonalCalendar(calId);
+	var calId = folderIdElements[0].substr(1);
-     }
+	deletePersonalCalendar(calId);
+      }
+    }
   }
-
+  
   preventDefault(event);
 }
 
@@ -1510,13 +1548,9 @@ function deletePersonalCalendar(folderId) {
   var label
     = labels["Are you sure you want to delete the selected calendar?"];
   if (window.confirm(label)) {
-    if (document.deletePersonalCalendarAjaxRequest) {
+    removeFolderRequestCount++;
-      document.deletePersonalCalendarAjaxRequest.aborted = true;
-      document.deletePersonalCalendarAjaxRequest.abort();
-    }
     var url = ApplicationBaseURL + "/" + folderId + "/deleteFolder";
-    document.deletePersonalCalendarAjaxRequest
+    triggerAjaxRequest(url, deletePersonalCalendarCallback, folderId);
-      = triggerAjaxRequest(url, deletePersonalCalendarCallback, folderId);
   }
 }
 
@@ -1536,11 +1570,13 @@ function deletePersonalCalendarCallback(http) {
 	else
 	  i++;
       }
-      refreshEvents();
+      removeFolderRequestCount--;
-      refreshTasks();
+      if (removeFolderRequestCount == 0) {
-      changeCalendarDisplay();
+	refreshEvents();
+	refreshTasks();
+	changeCalendarDisplay();
+      }
     }
-    document.deletePersonalCalendarAjaxRequest = null;
   }
   else
     log ("ajax problem 5: " + http.status);

UI/WebServerResources/generic.js

@@ -27,7 +27,6 @@ var logWindow = null;
 
 var queryParameters;
 
-var activeAjaxRequests = 0;
 var menus = new Array();
 var search = {};
 var sorting = {};
@@ -42,6 +41,10 @@ var allDocumentElements = null;
 var userDefaults = null;
 var userSettings = null;
 
+// Ajax requests counts
+var activeAjaxRequests = 0;
+var removeFolderRequestCount = 0;
+
 /* a W3C compliant document.all */
 function getAllScopeElements(scope) {
   var elements = new Array();
@@ -1029,19 +1032,18 @@ function subscribeToFolder(refreshCallback, refreshCallbackData) {
 							  rfCbData);
   }
   else
-    refreshCallbackData["window"].alert(clabels["You cannot subscribe to a folder that you own!"]
+    refreshCallbackData["window"].alert(clabels["You cannot subscribe to a folder that you own!"]);
-					);
 }
 
 function folderUnsubscriptionCallback(http) {
   if (http.readyState == 4) {
+    removeFolderRequestCount--;
     if (isHttpStatus204(http.status)) {
       if (http.callbackData)
 	http.callbackData["method"](http.callbackData["data"]);
     }
     else
       window.alert(clabels["Unable to unsubscribe from that folder!"]);
-    document.unsubscriptionAjaxRequest = null;
   }
 }
 
@@ -1051,19 +1053,16 @@ function unsubscribeFromFolder(folder, refreshCallback, refreshCallbackData) {
 					refreshCallbackData);
   }
   else {
-    var folderData = folder.split("+");
+    var folderData = folder.split("_");
     var username = folderData[0];
     var folderPath = folderData[1];
+    if (username.startsWith('/'))
+      username = username.substring(1);
     if (username != UserLogin) {
       var url = (ApplicationBaseURL + folder + "/unsubscribe");
-      if (document.unsubscriptionAjaxRequest) {
+      removeFolderRequestCount++;
-	document.unsubscriptionAjaxRequest.aborted = true;
-	document.unsubscriptionAjaxRequest.abort();
-      }
       var rfCbData = { method: refreshCallback, data: refreshCallbackData };
-      document.unsubscriptionAjaxRequest
+      triggerAjaxRequest(url, folderUnsubscriptionCallback, rfCbData);
-	= triggerAjaxRequest(url, folderUnsubscriptionCallback,
-			     rfCbData);
     }
     else
       window.alert(clabels["You cannot unsubscribe from a folder that you own!"]);
@@ -1084,6 +1083,17 @@ function accessToSubscribedFolder(serverFolder) {
   return folder;
 }
 
+function getSubscribedFolderOwner(serverFolder) {
+  var owner;
+  
+  var parts = serverFolder.split(":");
+  if (parts.length > 1) {
+    owner = parts[0];
+  }
+  
+  return owner;
+}
+
 function listRowMouseDownHandler(event) {
   preventDefault(event);
   //Event.stop(event); 
@@ -1414,7 +1424,7 @@ function createFolderCallback(http) {
     var data = http.callbackData;
     if (http.status == 201) {
       if (data.okCB)
-	data.okCB(data.name, "/" + http.responseText);
+	data.okCB(data.name, "/" + http.responseText, UserLogin);
     }
     else {
       if (data.notOkCB)