From a9a7cd5645b4e21c6aa47602772592be20c55276 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Fri, 13 Oct 2006 23:35:10 +0000
Subject: [PATCH] Monotone-Parent: 68199c5cc8e98c86746b92d1731f52247f2677c9
 Monotone-Revision: 46d8b975e3331072d720cf1a857776556c26b874

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-10-13T23:35:10
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                        |  3 +++
 UI/WebServerResources/generic.js | 32 ++++++++++++++++++++++----------
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7149a8c32..325e2ee51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-10-13  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/WebServerResources/generic.js: added handling of notification
+	of changes to contact selectors.
+
 	* UI/Scheduler/UIxCalMainView.m ([UIxCalMainView
 	-updateCalendarsAction]): proxy method to update the user
 	preference table with the new selected calendar uids.
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index 27746b8c4..7e0ef95a9 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -891,10 +891,10 @@ function initCriteria()
 
 function onContactAdd(node)
 {
+  var selector = node.parentNode.parentNode;
   var selectorUrl = '?popup=YES';
   if (node)
-    selectorUrl += ("&selectorId="
-                    + node.parentNode.parentNode.getAttribute("id"));
+    selectorUrl += ("&selectorId=" + selector.getAttribute("id"));
 
   urlstr = ApplicationBaseURL;
   if (urlstr[urlstr.length-1] != '/')
@@ -903,18 +903,21 @@ function onContactAdd(node)
              + contactSelectorAction + selectorUrl);
   log (urlstr);
   var w = window.open(urlstr, "Addressbook",
-                      "width=640,height=400,resizable=1,scrollbars=1,toolbar=0,"
-                      + "location=0,directories=0,status=0,menubar=0,copyhistory=0");
+                      "width=640,height=400,resizable=1,scrollbars=0");
+  w.selector = selector;
   w.focus();
 
   return false;
 }
 
 function onContactRemove(node) {
-  var selectorId = node.parentNode.parentNode.getAttribute("id");
+  var selector = node.parentNode.parentNode;
+  var selectorId = selector.getAttribute("id");
+  var hasChanged = false;
 
   var names = $('uixselector-' + selectorId + '-display');
   var nodes = names.getSelectedNodes();
+  hasChanged = (nodes.length > 0);
   for (var i = 0; i < nodes.length; i++) {
     var currentNode = nodes[i];
     currentNode.parentNode.removeChild(currentNode);
@@ -928,6 +931,9 @@ function onContactRemove(node) {
       ids.push(nodes[i].getAttribute("uid"));
   uids.value = ids.join(",");
 
+  if (selector.changeNotification && hasChanged)
+    selector.changeNotification();
+
   return false;
 }
 
@@ -937,13 +943,19 @@ function initTabs()
   var containers = document.getElementsByClassName("tabsContainer");
   for (var x = 0; x < containers.length; x++) {
     var container = containers[x];
-    var nodes = container.getElementsByTagName("li");
+    var nodes = container.childNodes[1].childNodes;
+
+    var firstTab;
     for (var i = 0; i < nodes.length; i++) {
-      nodes[i].addEventListener("mousedown", onTabMouseDown, true);
-      nodes[i].addEventListener("click", onTabClick, true);
+      if (nodes[i] instanceof HTMLLIElement) {
+        if (!firstTab) {
+          firstTab = nodes[i];
+        }
+        nodes[i].addEventListener("mousedown", onTabMouseDown, true);
+        nodes[i].addEventListener("click", onTabClick, true);
+      }
     }
 
-    var firstTab = nodes[0];
     firstTab.addClassName("first");
     firstTab.addClassName("active");
     container.activeTab = firstTab;
@@ -1113,7 +1125,7 @@ HTMLTableElement.prototype.selectRowsMatchingClass = function(className) {
   var nodes = tbody.childNodes;
   for (var i = 0; i < nodes.length; i++) {
     var node = nodes.item(i);
-    if (node instanceof HTMLElement ) {
+    if (node instanceof HTMLElement) {
       var classStr = '' + node.getAttribute("class");
       if (classStr.indexOf(className, 0) >= 0)
         selectNode(node);