Monotone-Parent: a8d43f7826f660df16fa423816e1157e114737bc

Monotone-Revision: ee5fdd0da3580c3ec9fd901d7645f82f3756fd31

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-05-28T19:19:17
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau 2007-05-28 19:19:17 +00:00
parent bd8b6762af
commit 9104d5c1f1
5 changed files with 24 additions and 30 deletions

View file

@ -612,9 +612,8 @@ function onMenuSharing(event) {
openAclWindow(url + "/acls", title); openAclWindow(url + "/acls", title);
} }
function initializeMenus() { function getMenus() {
menus["menuIds"] = new Array("contactFoldersMenu", "contactMenu", var menus = {};
"searchMenu");
menus["contactFoldersMenu"] = new Array(null, "-", null, menus["contactFoldersMenu"] = new Array(null, "-", null,
null, "-", null, "-", null, "-", null, "-",
onMenuSharing); onMenuSharing);
@ -623,7 +622,7 @@ function initializeMenus() {
onMenuDeleteContact); onMenuDeleteContact);
menus["searchMenu"] = new Array(setSearchCriteria); menus["searchMenu"] = new Array(setSearchCriteria);
initMenus(); return menus;
} }
function configureSearchField() { function configureSearchField() {

View file

@ -1275,12 +1275,8 @@ function folderOperationCallback(http) {
window.alert(labels["Operation failed"].decodeEntities()); window.alert(labels["Operation failed"].decodeEntities());
} }
function initializeMenus() { function getMenus() {
menus["menuIds"] = new Array("accountIconMenu", "inboxIconMenu", var menus = {}
"trashIconMenu", "mailboxIconMenu",
"addressMenu", "messageListMenu",
"messageContentMenu", "label-menu",
"mark-menu");
menus["accountIconMenu"] = new Array(null, null, onMenuCreateFolder, null, menus["accountIconMenu"] = new Array(null, null, onMenuCreateFolder, null,
null, null); null, null);
menus["inboxIconMenu"] = new Array(null, null, null, "-", null, menus["inboxIconMenu"] = new Array(null, null, null, "-", null,
@ -1317,7 +1313,8 @@ function initializeMenus() {
null); null);
menus["mark-menu"] = new Array(null, null, null, null, "-", null, "-", menus["mark-menu"] = new Array(null, null, null, null, "-", null, "-",
null, null, null); null, null, null);
initMenus();
return menus;
} }
Event.observe(window, "load", initMailer); Event.observe(window, "load", initMailer);

View file

@ -982,11 +982,9 @@ function browseURL(anchor, event) {
return false; return false;
} }
function initializeMenus() { function getMenus() {
menus["menuIds"] = new Array("monthListMenu", "yearListMenu", var menus = {};
"appointmentsListMenu",
"calendarsMenu",
"searchMenu");
var dateMenu = new Array(); var dateMenu = new Array();
for (var i = 0; i < 12; i++) for (var i = 0; i < 12; i++)
dateMenu.push(onMonthMenuItemClick); dateMenu.push(onMonthMenuItemClick);
@ -1006,10 +1004,7 @@ function initializeMenus() {
null, "-", onMenuSharing); null, "-", onMenuSharing);
menus["searchMenu"] = new Array(setSearchCriteria); menus["searchMenu"] = new Array(setSearchCriteria);
initMenus(); return menus;
var selector = $("calendarSelector");
if (selector)
selector.attachMenu("calendarsMenu");
} }
function onMenuSharing(event) { function onMenuSharing(event) {
@ -1143,6 +1138,9 @@ function initCalendars() {
if (!document.body.hasClassName("popup")) { if (!document.body.hasClassName("popup")) {
initCalendarSelector(); initCalendarSelector();
configureSearchField(); configureSearchField();
var selector = $("calendarSelector");
if (selector)
selector.attachMenu("calendarsMenu");
} }
} }

View file

@ -293,8 +293,7 @@ SPAN.toolbarButton:active
border-bottom: 1px solid #424142; } border-bottom: 1px solid #424142; }
.menu UL .menu UL
{ { cursor: default;
cursor: default;
list-style-type: none; list-style-type: none;
list-style-image: none; list-style-image: none;
margin: 0px; margin: 0px;

View file

@ -929,12 +929,13 @@ function initTabs() {
} }
function initMenus() { function initMenus() {
for (var i = 0; i < menus["menuIds"].length; i++) { var menus = getMenus();
var menuId = menus["menuIds"][i]; if (menus) {
var callbacks = menus[menuId]; for (var menuID in menus) {
var menuDIV = $(menuId); var menuDIV = $(menuID);
if (menuDIV) if (menuDIV)
initMenu(menuDIV, callbacks); initMenu(menuDIV, menus[menuID]);
}
} }
} }
@ -1106,7 +1107,7 @@ function onLoadHandler(event) {
initLogConsole(); initLogConsole();
initCriteria(); initCriteria();
} }
initializeMenus(); initMenus();
initTabs(); initTabs();
configureDragHandles(); configureDragHandles();
configureSortableTableHeaders(); configureSortableTableHeaders();
@ -1157,7 +1158,7 @@ addEvent(window, 'DOMContentLoaded', onLoadHandler);
function configureDragHandles() { function configureDragHandles() {
} }
function initializeMenus() { function getMenus() {
} }
function onHeaderClick(event) { function onHeaderClick(event) {