See ChangeLog.

Monotone-Parent: e513d02feb1de3dd39a4bb5194208f11ea4fe880
Monotone-Revision: e58b519a51a061b80853202ec91f07ec470a2bf0

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-12-14T03:13:00
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -1,3 +1,8 @@
+2011-12-14  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/WebServerResources/ContactsUI.js (getMenus): register the
+	function onWindowResize only if it's not already defined.
+
 2011-12-12  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/Appointments/iCalEvent+SOGo.m (-quickRecord): set

UI/WebServerResources/ContactsUI.js

@@ -1322,6 +1322,7 @@ function initContacts(event) {
     if (typeof onWindowResize != 'function') {
         // When loaded from the mail editor, onWindowResize is
         // already registered
+        onWindowResize = onContactsWindowResize;
         onWindowResize.defer();
         Event.observe(window, "resize", onWindowResize);
     } 
@@ -1330,7 +1331,7 @@ function initContacts(event) {
     sorting["ascending"] = true;
 }
 
-function onWindowResize(event) {
+onContactsWindowResize = function (event) {
     var handle = $("dragHandle");
     if (handle)
         handle.adjust();

UI/WebServerResources/MailerUI.js

@@ -1910,7 +1910,6 @@ function onMessageListResize(event) {
 }
 
 function onWindowResize(event) {
-    log ("resize mailer");
     var handle = $("verticalDragHandle");
     if (handle)
         handle.adjust();

UI/WebServerResources/UIxMailEditor.js

@@ -25,7 +25,7 @@ function onContactAdd(button) {
     }
 
     $("hiddenDragHandle").adjust();
-    onMailEditorResize(null);
+    onWindowResize(null);
 }
 
 function addContact(tag, fullContactName, contactId, contactName, contactEmail) {
@@ -56,7 +56,7 @@ function addContact(tag, fullContactName, contactId, contactName, contactEmail)
             var select = $(td.childNodesWithTag("select")[0]);
             select.value = neededOptionValue;
             insertContact($("addr_" + currentIndex), contactName, contactEmail);
-            onMailEditorResize(null);
+            onWindowResize(null);
         }
     }
 }
@@ -212,7 +212,7 @@ function clickedEditorAttach() {
 
         if (!area.style.display) {
             area.setStyle({ display: "block" });
-            onMailEditorResize(null);
+            onWindowResize(null);
         }
         var inputs = area.getElementsByTagName("input");
         var attachmentName = "attachment" + attachmentCount;
@@ -368,7 +368,7 @@ function configureDragHandle() {
         handle.leftMargin = 100;
         handle.leftBlock=$("leftPanel");
         handle.rightBlock=$("rightPanel");
-        handle.observe("handle:dragged", onMailEditorResize);
+        handle.observe("handle:dragged", onWindowResize);
     }
 }
 
@@ -437,10 +437,10 @@ function initMailEditor() {
     $("contactFolder").observe("change", onContactFolderChange);
     
     
-    Event.observe(window, "resize", onMailEditorResize);
+    Event.observe(window, "resize", onWindowResize);
     Event.observe(window, "beforeunload", onMailEditorClose);
     
-    onMailEditorResize.defer();
+    onWindowResize.defer();
 }
 
 function focusCKEditor(event) {
@@ -584,7 +584,7 @@ function onSelectOptions(event) {
     }
 }
 
-function onMailEditorResize(event) {
+function onWindowResize(event) {
     if (!document.pageform)
       return;
     var textarea = document.pageform.text;
@@ -631,7 +631,7 @@ function onMailEditorResize(event) {
     if (composeMode == "html") {
         var editor = $('cke_text');
         if (editor == null) {
-            onMailEditorResize.defer();
+            onWindowResize.defer();
             return;
         }
         var ck_top = $("cke_top_text");