From 7bc8c818e939a8a38907c2044937b4b37cee80af Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Tue, 9 Sep 2008 18:44:25 +0000
Subject: [PATCH] Monotone-Parent: 994b69bf5b441d8ad6fa804a31ee33b25a0ec13e
 Monotone-Revision: ffa02d814d2b95752685c44776cbbb2b26be4b47

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-09-09T18:44:25
Monotone-Branch: ca.inverse.sogo
---
 UI/WebServerResources/UIxMailEditor.js      |  8 +++++---
 UI/WebServerResources/UIxMailToSelection.js | 18 ++++++++----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/UI/WebServerResources/UIxMailEditor.js b/UI/WebServerResources/UIxMailEditor.js
index 02c108709..62245ee27 100644
--- a/UI/WebServerResources/UIxMailEditor.js
+++ b/UI/WebServerResources/UIxMailEditor.js
@@ -55,9 +55,11 @@ function addContact(tag, fullContactName, contactId, contactName, contactEmail)
 
 		if (!stop) {
 			fancyAddRow(false, "");
-			$($("row_" + counter).childNodesWithTag("td")[0]).childNodesWithTag("select")[0].value
-				= neededOptionValue;
-			insertContact($("addr_" + counter), contactName, contactEmail);
+			var row = $("row_" + currentIndex);
+			var td = $(row.childNodesWithTag("td")[0]);
+			var select = $(td.childNodesWithTag("select")[0]);
+			select.value = neededOptionValue;
+			insertContact($("addr_" + currentIndex), contactName, contactEmail);
 			onWindowResize(null);
 		}
 	}
diff --git a/UI/WebServerResources/UIxMailToSelection.js b/UI/WebServerResources/UIxMailToSelection.js
index 03853ff58..7db97b462 100644
--- a/UI/WebServerResources/UIxMailToSelection.js
+++ b/UI/WebServerResources/UIxMailToSelection.js
@@ -51,31 +51,29 @@ function checkAddresses() {
 }
 
 function fancyAddRow(shouldEdit, text, type) {
-  var addr, addressList, lastChild, proto, row, select, input;
-  
-  addr = $('addr_' + lastIndex);
+  var addr = $('addr_' + lastIndex);
   if (addr && addr.value == '') {
-    input = $('subjectField');
+    var input = $('subjectField');
     if (input && input.value != '') {
       input.focus();
       input.select();
       return;
     }
   }
-  addressList = $("addressList").tBodies[0];
-  lastChild = $("lastRow");
+  var addressList = $("addressList").tBodies[0];
+  var lastChild = $("lastRow");
   
   currentIndex++;
-  proto = lastChild.previous("tr");
-  row = proto.cloneNode(true);
+  var proto = lastChild.previous("tr");
+  var row = proto.cloneNode(true);
   row.writeAttribute("id", 'row_' + currentIndex);
 
   // select popup
   var rowNodes = row.childNodesWithTag("td");
-  select = $(rowNodes[0]).childNodesWithTag("select")[0];
+  var select = $(rowNodes[0]).childNodesWithTag("select")[0];
   select.name = 'popup_' + currentIndex;
   select.value = (type? type : proto.down("select").value);
-  input = $(rowNodes[1]).childNodesWithTag("input")[0];
+  var input = $(rowNodes[1]).childNodesWithTag("input")[0];
   input.name  = 'addr_' + currentIndex;
   input.id = 'addr_' + currentIndex;
   input.value = text;