Monotone-Parent: 0821c01300e63c1e0fa4909e334a07e27cde4167
Monotone-Revision: e9f80c69ee8be6db993d9c5dbe117db754ae55a1 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-10-11T20:13:26 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
parent
55a5e29854
commit
cbf3c15677
|
@ -1,5 +1,10 @@
|
||||||
2010-10-11 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
2010-10-11 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||||
|
|
||||||
|
* UI/WebServerResources/ContactsUI.js:
|
||||||
|
(onToolbarWriteToSelectedContacts): display an error message when
|
||||||
|
no contact is selected rather than composing a new message. Fixed
|
||||||
|
the method to only have one return point.
|
||||||
|
|
||||||
* UI/WebServerResources/generic.js: (triggerAjaxRequest): added an
|
* UI/WebServerResources/generic.js: (triggerAjaxRequest): added an
|
||||||
optional "attempt" argument that enables counting the number of
|
optional "attempt" argument that enables counting the number of
|
||||||
invocations for an ajax request.
|
invocations for an ajax request.
|
||||||
|
|
|
@ -414,16 +414,15 @@ function onToolbarWriteToSelectedContacts(event) {
|
||||||
var rowsWithEmail = 0;
|
var rowsWithEmail = 0;
|
||||||
|
|
||||||
if (rows.length == 0) {
|
if (rows.length == 0) {
|
||||||
openMailComposeWindow(ApplicationBaseURL + "Mail/compose");
|
showAlertDialog(_("Please select a contact."));
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
|
else {
|
||||||
openMailComposeWindow(ApplicationBaseURL + "../Mail/compose"
|
openMailComposeWindow(ApplicationBaseURL + "../Mail/compose"
|
||||||
+ "?folder=" + Contact.currentAddressBook.substring(1)
|
+ "?folder=" + Contact.currentAddressBook.substring(1)
|
||||||
+ "&uid=" + rows.join("&uid="));
|
+ "&uid=" + rows.join("&uid="));
|
||||||
|
|
||||||
if (document.body.hasClassName("popup"))
|
if (document.body.hasClassName("popup"))
|
||||||
window.close();
|
window.close();
|
||||||
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue