amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-03-02 05:36:23 +00:00
Code Issues Projects Releases Wiki Activity

merge of 'addd7d5e87d3a58601c005b2b25baaecc4ac4ece'

Browse Source 
and 'f47bc809420338973f9f0d1ab2dabcacc7019252'

Monotone-Parent: addd7d5e87d3a58601c005b2b25baaecc4ac4ece
Monotone-Parent: f47bc809420338973f9f0d1ab2dabcacc7019252
Monotone-Revision: 35aeb39a4ff1d311050f0ab6cc5002f6896f9572

Monotone-Author: crobert@inverse.ca
Monotone-Author: flachapelle@inverse.ca
Monotone-Author: ludovic@Sophos.ca
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-10-14T21:21:09
Monotone-Date: 2008-10-14T23:00:25
Monotone-Date: 2008-10-15T04:02:54
Monotone-Date: 2008-10-15T14:21:17
Monotone-Branch: ca.inverse.sogo
Monotone-Branch: ca.inverse.sogo
Monotone-Branch: ca.inverse.sogo
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
C Robert
2008-10-14 21:21:09 +00:00
parent 2a5fd5f892 eb400fd2e5
commit cfbdbbc604
2 changed files with 29 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
UI/WebServerResources/MailerUI.js
View File

@@ -1896,7 +1896,7 @@ function _onMenuLabelFlagX(flag) {
if (document.menuTarget.tagName == "DIV")
// Menu called from message content view
messages.set(Mailer.currentMessages[Mailer.currentMailbox],
$('tr#row_' + Mailer.currentMessages[Mailer.currentMailbox]).getAttribute("labels"));
$('row_' + Mailer.currentMessages[Mailer.currentMailbox]).getAttribute("labels"));
else if (Object.isArray(document.menuTarget))
// Menu called from multiple selection in messages list view
$(document.menuTarget).collect(function(row) {

49
UI/WebServerResources/generic.js
View File

@@ -1216,29 +1216,36 @@ function initMenus() {
}
function initMenu(menuDIV, callbacks) {
var lis = menuDIV.down("ul").childNodesWithTag("li");
for (var j = 0; j < lis.length; j++) {
var node = $(lis[j]);
node.observe("mousedown", listRowMouseDownHandler, false);
var callback = callbacks[j];
if (callback) {
if (typeof(callback) == "string") {
if (callback == "-")
node.addClassName("separator");
else {
node.submenu = callback;
node.addClassName("submenu");
node.observe("mouseover", popupSubmenu);
}
}
else {
node.observe("mouseup", onBodyClickMenuHandler);
node.menuCallback = callback;
node.observe("click", onMenuClickHandler);
var uls = menuDIV.childNodesWithTag("ul");
for (var i = 0; i < uls.length; i++) {
var lis = $(uls[i]).childNodesWithTag("li");
for (var j = 0; j < lis.length; j++) {
var node = $(lis[j]);
node.observe("mousedown", listRowMouseDownHandler, false);
var callback;
if (i > 0)
callback = callbacks[i+j+1];
else
callback = callbacks[i+j];
if (callback) {
if (typeof(callback) == "string") {
if (callback == "-")
node.addClassName("separator");
else {
node.submenu = callback;
node.addClassName("submenu");
node.observe("mouseover", popupSubmenu);
}
}
else {
node.observe("mouseup", onBodyClickMenuHandler);
node.menuCallback = callback;
node.observe("click", onMenuClickHandler);
}
}
else
node.addClassName("disabled");
}
else
node.addClassName("disabled");
}
}