Monotone-Parent: e83902dbab2643711380599c555ac903400fd110

Monotone-Revision: 18f04728c7d6b1760dbcd750fc045948d7001567

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-06-23T20:44:54
Monotone-Branch: ca.inverse.sogo

UI/WebServerResources/ContactsUI.js

@@ -425,7 +425,7 @@ function uixDeleteSelectedContacts(sender) {
   }
 
   if (failCount > 0)
-    alert(labels["You cannot delete the selected contact(s)."]);
+    alert(labels["You cannot delete the selected contact(s)"]);
   else
     contactView.update();
   
@@ -563,7 +563,7 @@ function appendAddressBook(name, folder) {
   }
   else
     folder = "/" + name;
-  
+
   if (!owner)
     owner = UserLogin;
 
@@ -583,7 +583,9 @@ function appendAddressBook(name, folder) {
 
     li.setAttribute("id", folder);
     li.setAttribute("owner", owner);
-    li.appendChild(document.createTextNode(name));
+    li.appendChild(document.createTextNode(name
+					   .replace("&lt;", "<", "g")
+					   .replace("&gt;", ">", "g")));
     setEventsOnAddressBook(li);
   }
 
@@ -635,7 +637,7 @@ function onAddressBookRemove(event) {
       onFolderSelectionChange();
     }
     else {
-      var folderId = nodes[0].getAttribute("id").substr("1");
+      var folderId = nodes[0].getAttribute("id");
       unsubscribeFromFolder(folderId, owner, onFolderUnsubscribeCB, folderId);
     }
   }

UI/WebServerResources/SchedulerUI.js

@@ -842,6 +842,7 @@ function refreshCalendarEventsCallback(http) {
 function drawCalendarEvent(eventData, sd, ed) {
   var dateTuples = new Array();
 
+//   log ("drawCalendarEvent...");
   var viewStartDate = sd.asDate();
   var viewEndDate = ed.asDate();
 
@@ -850,7 +851,7 @@ function drawCalendarEvent(eventData, sd, ed) {
   var endDate = new Date();
   endDate.setTime(eventData[5] * 1000);
 
-  //log ("s: " + startDate + "; e: " + endDate);
+//   log ("s: " + startDate + "; e: " + endDate);
 
   var days = startDate.daysUpTo(endDate);
 
@@ -861,8 +862,8 @@ function drawCalendarEvent(eventData, sd, ed) {
   else
     title = eventData[3];
 
-  //    log("title: " + title); 
-  //    log("viewS: " + viewStartDate);
+//   log("title: " + title);
+//   log("viewS: " + viewStartDate);
   var startHour = null;
   var endHour = null;
    
@@ -872,7 +873,7 @@ function drawCalendarEvent(eventData, sd, ed) {
 	&& days[i].laterDate(viewEndDate) == viewEndDate) {
       var starts;
 
-      // 	 log("day: " + days[i]);
+//       log("day: " + days[i]);
       if (i == 0) {
 	var quarters = (startDate.getUTCHours() * 4
 			+ Math.floor(startDate.getUTCMinutes() / 15));
@@ -882,7 +883,7 @@ function drawCalendarEvent(eventData, sd, ed) {
       }
       else
 	starts = 0;
-	 
+
       var ends;
       var lasts;
       if (i == days.length - 1) {
@@ -953,10 +954,9 @@ function drawCalendarEvent(eventData, sd, ed) {
 }
 
 function eventClass(cname) {
-  return  escape(cname.replace(".", "-"));
+  return escape(cname.replace(".", "-"));
 }
 
-
 function newEventDIV(cname, calendar, starts, lasts,
 		     startHour, endHour, title) {
   var eventDiv = document.createElement("div");
@@ -1628,7 +1628,7 @@ function updateCalendarProperties(calendarID, calendarName, calendarColor) {
     nodeID = "/" + idParts[0] + "_" + folderName;
   else
     nodeID = "/" + folderName;
-  log("nodeID: " + nodeID);
+//   log("nodeID: " + nodeID);
   var calendarNode = $(nodeID);
   var childNodes = calendarNode.childNodes;
   childNodes[childNodes.length-1].nodeValue = calendarName;
@@ -1687,16 +1687,15 @@ function appendCalendar(folderName, folderPath) {
     li.setAttribute("id", folderPath);
     li.setAttribute("owner", owner);
 
-    var checkBox = document.createElement("input");
-    checkBox.setAttribute("type", "checkbox");
-    li.appendChild(checkBox);
+    var checkBox = createElement("input", null, "checkBox", { checked: 1 },
+				 { type: "checkbox" }, li);
     li.appendChild(document.createTextNode(" "));
-    $(checkBox).addClassName("checkBox");
-    checkBox.checked = 1;
 
     var colorBox = document.createElement("div");
     li.appendChild(colorBox);
-    li.appendChild(document.createTextNode(folderName));
+    li.appendChild(document.createTextNode(folderName
+					   .replace("&lt;", "<", "g")
+					   .replace("&gt;", ">", "g")));
     colorBox.appendChild(document.createTextNode("OO"));
 
     $(colorBox).addClassName("colorBox");

UI/WebServerResources/UIxContactsUserFolders.js

@@ -122,9 +122,9 @@ function onConfirmFolderSelection(event) {
     if (window.opener.userFolderType == "user") {
       var spans = document.getElementsByClassName("nodeName",
 						  topNode.selectedEntry);
-      var email = spans[0].innerHTML;
-      email = email.replace("&lt;", "<");
-      email = email.replace("&gt;", ">");
+      var email = (spans[0].innerHTML
+		   .replace("&lt;", "<", "g")
+		   .replace("&gt;", ">", "g"));
       folderName = email;
     }
     else {
@@ -132,9 +132,9 @@ function onConfirmFolderSelection(event) {
 						   node);
       var spans2 = document.getElementsByClassName("nodeName",
 						   node.parentNode.previousSibling);
-      var email = spans2[0].innerHTML;
-      email = email.replace("&lt;", "<");
-      email = email.replace("&gt;", ">");
+      var email = (spans2[0].innerHTML
+		   .replace("&lt;", "<", "g")
+		   .replace("&gt;", ">", "g"));
       folderName = spans1[0].innerHTML + ' (' + email + ')';
     }
     var data = { folderName: folderName, folder: folder, window: window };
@@ -154,10 +154,12 @@ function onFolderSearchKeyDown(event) {
 }
 
 function initUserFoldersWindow() {
-  $("searchValue").observe("keydown", onFolderSearchKeyDown);
+  var searchValue = $("searchValue");
+  searchValue.observe("keydown", onFolderSearchKeyDown);
   var addButton = $("addButton");
   addButton.observe("click", onConfirmFolderSelection);
   addButton.disabled = true;
+  searchValue.focus();
 }
 
 FastInit.addOnLoad(initUserFoldersWindow);

UI/WebServerResources/UIxMailEditor.js

@@ -420,7 +420,8 @@ function onMailEditorClose(event) {
     }
   }
 
-  if (MailEditor.addressBook && MailEditor.addressBook.open && !MailEditor.addressBook.closed)
+  if (MailEditor.addressBook && MailEditor.addressBook.open
+      && !MailEditor.addressBook.closed)
     MailEditor.addressBook.close();
 
   Event.stopObserving(window, "beforeunload", onMailEditorClose);

UI/WebServerResources/UIxMailToSelection.js

@@ -111,6 +111,7 @@ function addressFieldLostFocus(sender) {
 	fancyAddRow(false, addr, $(sender).up("tr").down("select").value);
     }
   }
+  onWindowResize(null);
 
   return false;
 }

UI/WebServerResources/generic.js

@@ -142,7 +142,7 @@ function extractEmailAddress(mailTo) {
   var email = "";
 
   var emailre
-    = /([a-zA-Z0-9]+[a-zA-Z0-9\._-]+[a-zA-Z0-9]+@[a-zA-Z0-9]+[a-zA-Z0-9\._-]+[a-zA-Z0-9]+)/g;
+    = /(([a-zA-Z0-9\._-]+)*[a-zA-Z0-9_-]+@([a-zA-Z0-9\._-]+)*[a-zA-Z0-9_-]+)/g;
   if (emailre.test(mailTo)) {
     emailre.exec(mailTo);
     email = RegExp.$1;