merge of 'f584567c8afbbff241518e2921242b309817109e'

and 'f5a1afa00cd2252fc46729f5c1ce5772b833cfb6'

Monotone-Parent: f584567c8afbbff241518e2921242b309817109e
Monotone-Parent: f5a1afa00cd2252fc46729f5c1ce5772b833cfb6
Monotone-Revision: 8a3245a182ef9dff851cee5ace6db39fa33a3b6c

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-12-07T16:14:28
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -1,3 +1,8 @@
+2011-12-06  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/WebServerResources/ContactsUI.js (contactsListCallback):
+	Force deselection of all rows when changing addressbook.
+
 2011-12-06  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/Appointments/iCalEvent+SOGo.m (-firstOccurrenceRange):

UI/WebServerResources/ContactsUI.js

@@ -190,8 +190,7 @@ function contactsListCallback(http) {
 
             // Restore selection and scroll to first selected node
             var selection = http.callbackData;
-            if (selection) {
-                tbody.refreshSelectionByIds(selection);
+            if (selection && tbody.refreshSelectionByIds(selection) > 0) {
                 for (var i = 0; i < selection.length; i++) {
                     var row = $(selection[i]);
                     if (row) {
@@ -202,7 +201,8 @@ function contactsListCallback(http) {
                     }
                 }
             }
-            
+            else
+                tbody.deselectAll();
         }
         else {
             // No more access to this address book; empty the list

UI/WebServerResources/HTMLElement.js

@@ -257,12 +257,14 @@ Element.addMethods({
             var s = element.select("._selected");
             for (var i = 0; i < s.length; i++)
                 s[i].removeClassName("_selected");
+
             element.selectedElements = null;
             element.selectedIds = null;
         },
 
         refreshSelectionByIds: function(element, selectedIds) {
             element = $(element);
+            var selectedCount = 0;
             if (selectedIds)
                 element.selectedIds = selectedIds;
             if (element.selectedIds) {
@@ -272,6 +274,7 @@ Element.addMethods({
                     if (e) {
                         if (!e.hasClassName('_selected'))
                             e.addClassName('_selected');
+                        selectedCount++;
                     }
                     else {
                         log ("refreshSelectionByIds Error: " + element.tagName
@@ -280,6 +283,7 @@ Element.addMethods({
                     }
                 }
             }
+            return selectedCount;
         },
 
         setCaretTo: function(element, pos) {