LupusNobilis/sogo
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

merge of '95d6401b61dda37ed3a6fc0177c3a09c96cea4ca'

Browse source 
and 'd4812ea4a50ad648584e08fb8b3831fdc2b4a4ab'

Monotone-Parent: 95d6401b61dda37ed3a6fc0177c3a09c96cea4ca
Monotone-Parent: d4812ea4a50ad648584e08fb8b3831fdc2b4a4ab
Monotone-Revision: 0c51f7b3e009fbf917f380938c76be5a98a288d0

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2007-11-23T16:52:34
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle 2007-11-23 16:52:34 +00:00
parent e13dfcb9eb 4c5c55671c
commit 5b4a14c031
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
UI/WebServerResources/generic.js
View file

@ -241,9 +241,10 @@ function openMailComposeWindow(url, wId) {
else {
var r = new RegExp("[\.\/-]", "g");
wId = wId.replace(r, "_");
if (document.body.hasClassName("popup"))
parentWindow = window.opener;
}
if (document.body.hasClassName("popup"))
parentWindow = window.opener;
var w = parentWindow.open(url, wId,
"width=680,height=520,resizable=1,scrollbars=1,toolbar=0,"
@ -491,6 +492,10 @@ function onRowClick(event) {
var node = getTarget(event);
var rowIndex = null;
if (!Event.isLeftClick(event))
// Ignore non primary-click (ie right-click)
return true;
if (node.tagName == 'TD') {
node = node.parentNode; // select TR
rowIndex = node.rowIndex - $(node).up('table').down('thead').getElementsByTagName('tr').length;
@ -1107,7 +1112,7 @@ function initMenus() {
}
function initMenu(menuDIV, callbacks) {
var lis = $(menuDIV.childNodesWithTag("ul")[0]).childNodesWithTag("li");
var lis = $(menuDIV.down("ul")).childNodesWithTag("li");
for (var j = 0; j < lis.length; j++) {
var node = $(lis[j]);
node.observe("mousedown", listRowMouseDownHandler, false);