From 103c5fad9be8163fbdcd075f8821af67e01651aa Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Tue, 9 Sep 2008 19:01:38 +0000
Subject: [PATCH] Monotone-Parent: ffa02d814d2b95752685c44776cbbb2b26be4b47
 Monotone-Revision: cef5766f36be67ad2c832de6c30036169a70cff5

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2008-09-09T19:01:38
Monotone-Branch: ca.inverse.sogo
---
 UI/WebServerResources/ContactsUI.js      | 18 +++---------------
 UI/WebServerResources/SOGoDragHandles.js |  8 +++++---
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js
index cdb140ef2..b325ae2ec 100644
--- a/UI/WebServerResources/ContactsUI.js
+++ b/UI/WebServerResources/ContactsUI.js
@@ -547,30 +547,18 @@ function onConfirmContactSelection(event) {
   var currentAddressBookName = folderLi.innerHTML;
   var selectorList = null;
   var initialValues = null;
-
-  if (selector) {
-    var selectorId = selector.getAttribute("id");
-    selectorList = opener.window.document.getElementById('uixselector-'
-																												 + selectorId
-																												 + '-uidList');
-    initialValues = selectorList.value;
-  }
-
+	
   var contactsList = $("contactsList");
   var rows = contactsList.getSelectedRows();
   for (i = 0; i < rows.length; i++) {
     var cid = rows[i].getAttribute("contactid");
     var cname = '' + rows[i].getAttribute("contactname");
     var email = '' + rows[i].cells[1].innerHTML;
-
+		
     window.opener.addContact(tag, currentAddressBookName + '/' + cname,
 														 cid, cname, email);
   }
 
-  if (selector && selector.changeNotification
-      && selectorList.value != initialValues)
-    selector.changeNotification("addition");
-
   preventDefault(event);
 }
 
@@ -993,7 +981,7 @@ function getMenus() {
 function configureSelectionButtons() {
   var container = $("contactSelectionButtons");
   if (container) {
-    var buttons = container.childNodesWithTag("input");
+    var buttons = container.select("input");
     for (var i = 0; i < buttons.length; i++)
       $(buttons[i]).observe("click", onConfirmContactSelection);
   }
diff --git a/UI/WebServerResources/SOGoDragHandles.js b/UI/WebServerResources/SOGoDragHandles.js
index 1b89f93aa..9b953747f 100644
--- a/UI/WebServerResources/SOGoDragHandles.js
+++ b/UI/WebServerResources/SOGoDragHandles.js
@@ -141,9 +141,11 @@ var SOGoDragHandlesInterface = {
     }
   },
  saveDragHandleState: function (type, position) {
-    var urlstr =  ApplicationBaseURL + "saveDragHandleState"
-    + "?" + type + "=" + position;
-    triggerAjaxRequest(urlstr, this.saveDragHandleStateCallback);
+		if (!$(document.body).hasClassName("popup")) {
+			var urlstr =  ApplicationBaseURL + "saveDragHandleState"
+			+ "?" + type + "=" + position;
+			triggerAjaxRequest(urlstr, this.saveDragHandleStateCallback);
+		}
   },
     
  saveDragHandleStateCallback: function (http) {