From cbf3c1567766b6b03c3f7697b57ae5999c0b0c3b Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Mon, 11 Oct 2010 20:13:26 +0000 Subject: [PATCH] Monotone-Parent: 0821c01300e63c1e0fa4909e334a07e27cde4167 Monotone-Revision: e9f80c69ee8be6db993d9c5dbe117db754ae55a1 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-10-11T20:13:26 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 5 +++++ UI/WebServerResources/ContactsUI.js | 17 ++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 46a4bb136..4164f16ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2010-10-11 Wolfgang Sourdeau + * 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. diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js index d47dc77eb..7a9f15395 100644 --- a/UI/WebServerResources/ContactsUI.js +++ b/UI/WebServerResources/ContactsUI.js @@ -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; }