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

See ChangeLog 

Monotone-Parent: 0c3748259db0825d5fe165f158e8663e4f885dc2
Monotone-Revision: 0a4b114d2f6d275bb25991bd16c7f776c00ee233

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2010-02-08T17:01:39
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Francis Lachapelle 2010-02-08 17:01:39 +00:00
parent 9fa26189c5
commit f84de5a75e
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,9 @@
2010-02-08 Francis Lachapelle <flachapelle@inverse.ca>
* UI/WebServerResources/ContactsUI.js (-onAddressBookRemove):
avoid selecting the personal addressbook prior to obtaining the
user's answer.
* UI/MailerUI/UIxMailListView.m (-messageSize): improved
formatting of message size.

10
UI/WebServerResources/ContactsUI.js
View File

@ -680,7 +680,9 @@ function onAddressBookAdd(event) {
function onFolderUnsubscribeCB(folderId) {
var node = $(folderId);
node.deselect();
node.parentNode.removeChild(node);
var personal = $("/personal");
personal.selectElement();
onFolderSelectionChange();
@ -740,7 +742,6 @@ function onAddressBookRemove(event) {
var nodes = selector.getSelectedNodes();
if (nodes.length > 0) {
var node = $(nodes[0]);
node.deselect();
var owner = node.getAttribute("owner");
if (owner == "nobody") {
var label = getLabel("You cannot remove nor unsubscribe from a public addressbook.");
@ -750,9 +751,6 @@ function onAddressBookRemove(event) {
var folderIdElements = node.getAttribute("id").split(":");
var abId = folderIdElements[0].substr(1);
deletePersonalAddressBook(abId);
var personal = $("/personal");
personal.selectElement();
onFolderSelectionChange();
}
else {
var folderId = node.getAttribute("id");
@ -796,12 +794,16 @@ function deletePersonalAddressBookCallback(http) {
while (!done && i < children.length) {
var currentFolderId = children[i].getAttribute("id").substr(1);
if (currentFolderId == http.callbackData) {
children[i].deselect();
ul.removeChild(children[i]);
done = true;
}
else
i++;
}
var personal = $("/personal");
personal.selectElement();
onFolderSelectionChange();
}
document.deletePersonalABAjaxRequest = null;
}