From 9104d5c1f1c7735843c809917f082ad3b64ac151 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Mon, 28 May 2007 19:19:17 +0000
Subject: [PATCH] Monotone-Parent: a8d43f7826f660df16fa423816e1157e114737bc
 Monotone-Revision: ee5fdd0da3580c3ec9fd901d7645f82f3756fd31

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-05-28T19:19:17
Monotone-Branch: ca.inverse.sogo
---
 UI/WebServerResources/ContactsUI.js  |  7 +++----
 UI/WebServerResources/MailerUI.js    | 11 ++++-------
 UI/WebServerResources/SchedulerUI.js | 16 +++++++---------
 UI/WebServerResources/generic.css    |  3 +--
 UI/WebServerResources/generic.js     | 17 +++++++++--------
 5 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js
index 3b9dd8e9b..264ccac5a 100644
--- a/UI/WebServerResources/ContactsUI.js
+++ b/UI/WebServerResources/ContactsUI.js
@@ -612,9 +612,8 @@ function onMenuSharing(event) {
    openAclWindow(url + "/acls", title);
 }
 
-function initializeMenus() {
-   menus["menuIds"] = new Array("contactFoldersMenu", "contactMenu",
-				"searchMenu");
+function getMenus() {
+   var menus = {};
    menus["contactFoldersMenu"] = new Array(null, "-", null,
 					   null, "-", null, "-",
 					   onMenuSharing);
@@ -623,7 +622,7 @@ function initializeMenus() {
 				    onMenuDeleteContact);
    menus["searchMenu"] = new Array(setSearchCriteria);
 
-   initMenus();
+   return menus;
 }
 
 function configureSearchField() {
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 2c40d3404..0deaf4c37 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -1275,12 +1275,8 @@ function folderOperationCallback(http) {
       window.alert(labels["Operation failed"].decodeEntities());
 }
 
-function initializeMenus() {
-   menus["menuIds"] = new Array("accountIconMenu", "inboxIconMenu",
-				"trashIconMenu", "mailboxIconMenu",
-				"addressMenu", "messageListMenu",
-				"messageContentMenu", "label-menu",
-				"mark-menu");
+function getMenus() {
+   var menus = {}
    menus["accountIconMenu"] = new Array(null, null, onMenuCreateFolder, null,
 					null, null);
    menus["inboxIconMenu"] = new Array(null, null, null, "-", null,
@@ -1317,7 +1313,8 @@ function initializeMenus() {
 				   null);
    menus["mark-menu"] = new Array(null, null, null, null, "-", null, "-",
 				  null, null, null);
-   initMenus();
+
+   return menus;
 }
 
 Event.observe(window, "load", initMailer);
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index 3d62d98f4..492337d55 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -982,11 +982,9 @@ function browseURL(anchor, event) {
   return false;
 }
 
-function initializeMenus() {
-   menus["menuIds"] = new Array("monthListMenu", "yearListMenu",
-				"appointmentsListMenu",
- 				"calendarsMenu",
- 				"searchMenu");
+function getMenus() {
+   var menus = {};
+
    var dateMenu = new Array();
    for (var i = 0; i < 12; i++)
       dateMenu.push(onMonthMenuItemClick);
@@ -1006,10 +1004,7 @@ function initializeMenus() {
 				      null, "-", onMenuSharing);
    menus["searchMenu"] = new Array(setSearchCriteria);
 
-   initMenus();
-   var selector = $("calendarSelector");
-   if (selector)
-      selector.attachMenu("calendarsMenu");
+   return menus;
 }
 
 function onMenuSharing(event) {
@@ -1143,6 +1138,9 @@ function initCalendars() {
    if (!document.body.hasClassName("popup")) {
       initCalendarSelector();
       configureSearchField();
+      var selector = $("calendarSelector");
+      if (selector)
+	 selector.attachMenu("calendarsMenu");
    }
 }
 
diff --git a/UI/WebServerResources/generic.css b/UI/WebServerResources/generic.css
index 17fb37b25..ca630042b 100644
--- a/UI/WebServerResources/generic.css
+++ b/UI/WebServerResources/generic.css
@@ -293,8 +293,7 @@ SPAN.toolbarButton:active
   border-bottom: 1px solid #424142; }
 
 .menu UL
-{ 
-  cursor: default;
+{ cursor: default;
   list-style-type: none;
   list-style-image: none;
   margin: 0px;
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index 8c7d69e7d..8601329da 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -929,12 +929,13 @@ function initTabs() {
 }
 
 function initMenus() {
-   for (var i = 0; i < menus["menuIds"].length; i++) {
-      var menuId = menus["menuIds"][i];
-      var callbacks = menus[menuId];
-      var menuDIV = $(menuId);
-      if (menuDIV)
-	 initMenu(menuDIV, callbacks);
+   var menus = getMenus();
+   if (menus) {
+      for (var menuID in menus) {
+	 var menuDIV = $(menuID);
+	 if (menuDIV)
+	    initMenu(menuDIV, menus[menuID]);
+      }
    }
 }
 
@@ -1106,7 +1107,7 @@ function onLoadHandler(event) {
 	initLogConsole();
 	initCriteria();
     }
-    initializeMenus();
+    initMenus();
     initTabs();
     configureDragHandles();
     configureSortableTableHeaders();
@@ -1157,7 +1158,7 @@ addEvent(window, 'DOMContentLoaded', onLoadHandler);
 function configureDragHandles() {
 }
 
-function initializeMenus() {
+function getMenus() {
 }
 
 function onHeaderClick(event) {