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

Monotone-Parent: 0821c01300e63c1e0fa4909e334a07e27cde4167

Browse source 
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:
Wolfgang Sourdeau 2010-10-11 20:13:26 +00:00
parent 55a5e29854
commit cbf3c15677
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,5 +1,10 @@
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
optional "attempt" argument that enables counting the number of
invocations for an ajax request.

17
UI/WebServerResources/ContactsUI.js
View file

@ -414,16 +414,15 @@ function onToolbarWriteToSelectedContacts(event) {
var rowsWithEmail = 0;
if (rows.length == 0) {
openMailComposeWindow(ApplicationBaseURL + "Mail/compose");
return false;
showAlertDialog(_("Please select a contact."));
}
else {
openMailComposeWindow(ApplicationBaseURL + "../Mail/compose"
+ "?folder=" + Contact.currentAddressBook.substring(1)
+ "&uid=" + rows.join("&uid="));
if (document.body.hasClassName("popup"))
window.close();
}
openMailComposeWindow(ApplicationBaseURL + "../Mail/compose"
+ "?folder=" + Contact.currentAddressBook.substring(1)
+ "&uid=" + rows.join("&uid="));
if (document.body.hasClassName("popup"))
window.close();
return false;
}