From 2af02d005a8f1ece36297952800c0a7c499ec8ac Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Thu, 11 Sep 2008 18:15:01 +0000
Subject: [PATCH] Monotone-Parent: 72f5e703f3c441de88fb23964d0260f26fe12527
 Monotone-Revision: 4f58ba7ba8f5347cf5b339ec697f0ded2a38f41b

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2008-09-11T18:15:01
Monotone-Branch: ca.inverse.sogo
---
 UI/WebServerResources/UIxAclEditor.js         |  2 +-
 .../UIxContactsUserFolders.js                 | 23 +++++++++----------
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/UI/WebServerResources/UIxAclEditor.js b/UI/WebServerResources/UIxAclEditor.js
index 19046a0fb..d8ef9aa2b 100644
--- a/UI/WebServerResources/UIxAclEditor.js
+++ b/UI/WebServerResources/UIxAclEditor.js
@@ -71,7 +71,7 @@ function removeUserCallback(http) {
 	var node = http.callbackData;
 
   if (http.readyState == 4
-      && http.status == 204)
+      && isHttpStatus204(http.status))
 		node.parentNode.removeChild(node);
   else
 		log("error deleting user: " + node.getAttribute("id"));
diff --git a/UI/WebServerResources/UIxContactsUserFolders.js b/UI/WebServerResources/UIxContactsUserFolders.js
index a5ac78356..7fd196b24 100644
--- a/UI/WebServerResources/UIxContactsUserFolders.js
+++ b/UI/WebServerResources/UIxContactsUserFolders.js
@@ -104,14 +104,14 @@ function userFoldersCallback(http) {
   var div = $("folders");
   if (http.status == 200) {
     var response = http.responseText;
-    div.innerHTML = buildTree(http.responseText);
+    div.update(buildTree(http.responseText));
     div.clean = false;
     var nodes = document.getElementsByClassName("node", $("d"));
     for (i = 0; i < nodes.length; i++)
       $(nodes[i]).observe("click", onFolderTreeItemClick);
   }
   else if (http.status == 404)
-    div.innerHTML = "";
+    div.update();
 }
 
 function onConfirmFolderSelection(event) {
@@ -122,23 +122,21 @@ function onConfirmFolderSelection(event) {
 
     var folderName;
     if (window.opener.userFolderType == "user") {
-      var spans = document.getElementsByClassName("nodeName",
-																									topNode.selectedEntry);
-      var email = (spans[0].innerHTML
+			var span = $(topNode.selectedEntry).down("SPAN.nodeName");
+			var email = (span.innerHTML
 									 .replace("&lt;", "<", "g")
 									 .replace("&gt;", ">", "g"));
       folderName = email;
     }
     else {
-      log("topNode.selectedEntry: " + topNode.selectedEntry.innerHTML);
-      var spans1 = topNode.selectedEntry.childNodesWithTag("span");
-      var spans2 = document.getElementsByClassName("nodeName",
-																									 node.parentNode.previousSibling);
-      var email = (spans2[0].innerHTML
+			var resource = $(topNode.selectedEntry).down("SPAN.nodeName");
+			var user = $(node.parentNode.previousSibling).down("SPAN.nodeName");
+			var email = (user.innerHTML
 									 .replace("&lt;", "<", "g")
 									 .replace("&gt;", ">", "g"));
-      folderName = spans1[0].innerHTML + ' (' + email + ')';
+			folderName = resource.innerHTML + ' (' + email + ')';
     }
+
     var data = { folderName: folderName, folder: folder, window: window };
     if (parent$(accessToSubscribedFolder(folder)))
       window.alert(clabels["You have already subscribed to that folder!"]);
@@ -150,8 +148,9 @@ function onConfirmFolderSelection(event) {
 function onFolderSearchKeyDown(event) {
   var div = $("folders");
   if (!div.clean) {
-    div.innerHTML = "";
+    div.update();
     div.clean = true;
+		$("addButton").disabled = true;
   }
 }