Monotone-Parent: 995b68ade85d0d884cdf8f6fc87e55f0c376a80c

Monotone-Revision: 61fe02b6c3bc4f0aa3797d661d014d8c256b0de9

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-12-30T20:39:07
Monotone-Branch: ca.inverse.sogo

UI/WebServerResources/ContactsUI.js

@@ -512,9 +512,6 @@ function onToolbarDeleteSelectedContactsConfirm(dialogId) {
     var contactsList = $('contactsList');
     var rows = contactsList.getSelectedRowsId();
     for (var i = 0; i < rows.length; i++) {
-        var row = $(rows[i]);
-        row.deselect();
-        row.hide();
         delete cachedContacts[Contact.currentAddressBook + "/" + rows[i]];
         var urlstr = (URLForFolderID(Contact.currentAddressBook) + "/"
                       + rows[i] + "/delete");
@@ -532,6 +529,7 @@ function onContactDeleteEventCallback(http) {
                 $("contactView").update();
                 Contact.currentContact = null;
             }
+
             Contact.deleteContactsRequestCount--;
             if (Contact.deleteContactsRequestCount == 0) {
                 var nextRow = row.next("tr");
@@ -543,7 +541,10 @@ function onContactDeleteEventCallback(http) {
                     loadContact(Contact.currentContact);
                 }
             }
-            row.parentNode.removeChild(row);
+            if (row) {
+                row.deselect();
+                row.parentNode.removeChild(row);
+            }
         }
         else if (parseInt(http.status) == 403) {
             var row = $(http.callbackData);