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

merge of '5b69d2cd30194d3e8db89060210265b500c3a3e0'

Browse Source 
and 'dae312b4bfd2084618c23a6232f43e0a9c5d7938'

Monotone-Parent: 5b69d2cd30194d3e8db89060210265b500c3a3e0
Monotone-Parent: dae312b4bfd2084618c23a6232f43e0a9c5d7938
Monotone-Revision: cbbaf4a8411e0af4f8c4320f2c151556beba1fad

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-11-06T23:12:10
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2007-11-06 23:12:10 +00:00
parent f3a9826129 f2798d6886
commit abc0a8dda5
21 changed files with 178 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/WebServerResources/generic.js
+14 -6
View File
@@ -218,8 +218,13 @@ function openUserFolderSelector(callback, type) {
}
function openContactWindow(url, wId) {
if (!wId)
wId = "" + (new Date().getTime());
if (typeof wId == "undefined")
wId = "_blank";
else {
var r = new RegExp("[\.\/-]", "g");
wId = wId.replace(r, "_");
}
var w = window.open(url, wId,
"width=450,height=600,resizable=0,location=0");
w.focus();
@@ -230,12 +235,15 @@ function openContactWindow(url, wId) {
function openMailComposeWindow(url, wId) {
var parentWindow = this;
if (!wId)
wId = "" + (new Date().getTime());
else
if (typeof wId == "undefined")
wId = "_blank";
else {
var r = new RegExp("[\.\/-]", "g");
wId = wId.replace(r, "_");
if (document.body.hasClassName("popup"))
parentWindow = window.opener;
}
var w = parentWindow.open(url, wId,
"width=680,height=520,resizable=1,scrollbars=1,toolbar=0,"
+ "location=0,directories=0,status=0,menubar=0"