From eabc7b51516a71d189c3ee2a6bde52d07b24afa2 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Tue, 3 Oct 2006 22:06:00 +0000
Subject: [PATCH] Monotone-Parent: 0f63be72face4740bee6c25c5edb4288db5fe02b
 Monotone-Revision: a6c4bbb57d662ad1aae7751dd65e2e239aebf3a6

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-10-03T22:06:00
Monotone-Branch: ca.inverse.sogo
---
 UI/WebServerResources/UIxContactEditor.js |  6 ++++++
 UI/WebServerResources/generic.js          | 14 +++-----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/UI/WebServerResources/UIxContactEditor.js b/UI/WebServerResources/UIxContactEditor.js
index 9e76b3219..f0c52f3dc 100644
--- a/UI/WebServerResources/UIxContactEditor.js
+++ b/UI/WebServerResources/UIxContactEditor.js
@@ -19,6 +19,12 @@
  02111-1307, USA.
 */
 
+var uixEmailUsr = 
+  "([a-zA-Z0-9][a-zA-Z0-9_.-]*|\"([^\\\\\x80-\xff\015\012\"]|\\\\[^\x80-\xff])+\")";
+var uixEmailDomain = 
+  "([a-zA-Z0-9][a-zA-Z0-9._-]*\\.)*[a-zA-Z0-9][a-zA-Z0-9._-]*\\.[a-zA-Z]{2,5}";
+var uixEmailRegex = new RegExp("^"+uixEmailUsr+"\@"+uixEmailDomain+"$");
+
 var displayNameChanged = false;
 
 function unescapeCallbackParameter(s) {
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index 28e30419a..304409288 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -112,14 +112,6 @@ function ml_stripActionInURL(url) {
   return url;
 }
 
-/* emails */
-
-// var uixEmailUsr = 
-//   "([a-zA-Z0-9][a-zA-Z0-9_.-]*|\"([^\\\\\x80-\xff\015\012\"]|\\\\[^\x80-\xff])+\")";
-// var uixEmailDomain = 
-//   "([a-zA-Z0-9][a-zA-Z0-9._-]*\\.)*[a-zA-Z0-9][a-zA-Z0-9._-]*\\.[a-zA-Z]{2,5}";
-// var uixEmailRegex = new RegExp("^"+uixEmailUsr+"\@"+uixEmailDomain+"$");
-
 function extractEmailAddress(mailTo) {
   var email = "";
 
@@ -898,10 +890,10 @@ function initCriteria()
 
 function onContactAdd(node)
 {
-  var selectorUrl = '';
+  var selectorUrl = '?popup=YES';
   if (node)
-    selectorUrl = ("?selectorId="
-                   + node.parentNode.parentNode.getAttribute("id"));
+    selectorUrl += ("&selectorId="
+                    + node.parentNode.parentNode.getAttribute("id"));
 
   urlstr = ApplicationBaseURL;
   if (urlstr[urlstr.length-1] != '/')