Monotone-Parent: b5051834282e52ed3ada41a862242574f4f3016d

Monotone-Revision: 397fde917fae54c68a56446340e43b77444b00e1

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2007-11-21T15:04:37
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle
2007-11-21 15:04:37 +00:00
parent 6718be9192
commit e45d56f025
4 changed files with 10 additions and 9 deletions

View File

@@ -8,16 +8,16 @@ function onContactAdd() {
var selector = null;
var selectorURL = '?popup=YES&selectorId=mailer-contacts';
if (MailEditor.addressBook)
if (MailEditor.addressBook && MailEditor.addressBook.open && !MailEditor.addressBook.closed)
MailEditor.addressBook.focus();
else {
urlstr = ApplicationBaseURL
var urlstr = ApplicationBaseURL
+ "../Contacts/"
+ contactSelectorAction + selectorURL;
MailEditor.addressBook = window.open(urlstr, "_blank",
"width=640,height=400,resizable=1,scrollbars=0");
MailEditor.addressBook.selector = selector;
MailEditor.addressBook.opener = this;
MailEditor.addressBook.opener = self;
MailEditor.addressBook.focus();
}
@@ -392,7 +392,7 @@ function onMailEditorClose(event) {
}
}
if (MailEditor.addressBook)
if (MailEditor.addressBook && MailEditor.addressBook.open && !MailEditor.addressBook.closed)
MailEditor.addressBook.close();
Event.stopObserving(window, "beforeunload", onMailEditorClose);