See Changelog.

Monotone-Parent: c3ae9437f2d6f5684527ea0486ab6204b9ce62b2
Monotone-Revision: e3951f85165fbcdda1e4339ca3625cd4f4fbcf9f

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-03-11T20:06:38
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2011-03-11 20:06:38 +00:00
parent 7b1c213051
commit 3dcb595c5a
6 changed files with 27 additions and 20 deletions
+4 -6
View File
@@ -688,9 +688,8 @@ function getParentMenu(node) {
}
function onBodyClickMenuHandler(event) {
this.stopObserving(event.type);
hideMenu(document.currentPopupMenu);
document.body.stopObserving("click", onBodyClickMenuHandler);
document.body.stopObserving("mouseup", onBodyClickMenuHandler);
document.currentPopupMenu = null;
if (event)
@@ -1355,7 +1354,7 @@ function initMenu(menuDIV, callbacks) {
var lis = $(uls[i]).childNodesWithTag("li");
for (var j = 0; j < lis.length; j++) {
var node = $(lis[j]);
node.observe("mousedown", listRowMouseDownHandler, false);
node.on("mousedown", listRowMouseDownHandler);
var callback;
if (i > 0)
callback = callbacks[i+j+1];
@@ -1368,13 +1367,12 @@ function initMenu(menuDIV, callbacks) {
else {
node.submenu = callback;
node.addClassName("submenu");
node.observe("mouseover", popupSubmenu);
node.on("mouseover", popupSubmenu);
}
}
else {
node.observe("mouseup", onBodyClickMenuHandler);
node.menuCallback = callback;
node.observe("click", onMenuClickHandler);
node.on("mousedown", onMenuClickHandler);
}
}
else