From 6396b253bcb2e20fe259700d8f5ba72579302488 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Mon, 12 Feb 2007 13:52:22 +0000
Subject: [PATCH] Monotone-Parent: c804a1198c93f3d488e8064b304342c423eeb82b
 Monotone-Revision: 7ce0966fc13ccbfb75f533a6985bed77edeee8ab

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-02-12T13:52:22
Monotone-Branch: ca.inverse.sogo
---
 .../UIxContactsListViewContainer.wox          | 12 +++++------
 UI/WebServerResources/ContactsUI.js           | 21 ++++++++++++-------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox b/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox
index db46d71e0..084a6630d 100644
--- a/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox
+++ b/UI/Templates/ContactsUI/UIxContactsListViewContainer.wox
@@ -35,14 +35,14 @@
 
       <form name="searchform" var:href="view" var:_sort="sortKey"
         onsubmit="return onSearchFormSubmit();" method="GET">
-<!--	var:if condition="isPopup" const:negate="YES"> -->
-          <var:if condition="hideFolderTree" const:negate="YES">
+<!--	var:if condition="isPopup" const:negate="YES" -->
+<!--          <var:if condition="hideFolderTree" const:negate="YES" -->
             <div class="contactFoldersList" id="contactFoldersList">
               <div class="titlediv"
               ><var:string label:value="Address Books"
                 /></div>
-            <var:if var:condition="isPopup" const:negate="YES"
-              ><div class="toolbar" id="abToolbar">
+            <!-- var:if var:condition="isPopup" const:negate="YES" -->
+            <div class="toolbar" id="abToolbar">
                 <a href="#" class="toolbarButton"
                   ><span class="toolbarButton"
                     ><img rsrc:src="add-addressbook.png" label:title="New Addressbook..."
@@ -55,7 +55,7 @@
                   ><span class="toolbarButton"
                     ><img rsrc:src="remove-addressbook.png" label:title="Remove the selected Addressbook"
                       /></span></a
-                  ></div></var:if>
+                  ></div><!-- var:if -->
 
             <ul id="contactFolders"
               var:additional-addressbooks="additionalAddressBooks">
@@ -85,7 +85,7 @@
           </div>
 
           <div class="dragHandle" id="dragHandle"><!-- space --></div>
-        </var:if>
+        <!-- var:if -->
 
         <div id="rightPanel">
           <var:component className="UIxContactsFilterPanel" qualifier="qualifier" />
diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js
index a330a4526..b0333f8a4 100644
--- a/UI/WebServerResources/ContactsUI.js
+++ b/UI/WebServerResources/ContactsUI.js
@@ -106,9 +106,14 @@ function CurrentContactFolderURL() {
 function openContactsFolder(contactsFolder, params, external)
 {
   if (contactsFolder != currentContactFolder || params) {
-    if (contactsFolder == currentContactFolder)
-      selection = $("contactsList").getSelectedRowsId();
-    else
+     if (contactsFolder == currentContactFolder) {
+        var contactsList = $("contactsList");
+        if (contactsList)
+           selection = contactsList.getSelectedRowsId();
+        else
+           window.alert("no contactsList");
+     }
+     else
       selection = null;
 
     currentContactFolder = contactsFolder;
@@ -158,7 +163,7 @@ function contactsListCallback(http)
     configureSortableTableHeaders();
   }
   else
-    log ("ajax fuckage");
+    log ("ajax fuckage 1");
 }
 
 function onContactFoldersContextMenu(event)
@@ -266,7 +271,7 @@ function contactLoadCallback(http)
     div.innerHTML = content;
   }
   else
-    log ("ajax fuckage");
+    log ("ajax fuckage 2");
 }
 
 var rowSelectionCount = 0;
@@ -590,7 +595,7 @@ function addressBooksCallback(http) {
     document.addressBooksAjaxRequest = null;
   }
   else
-    log ("ajax fuckage");
+    log ("ajax fuckage 3");
 }
 
 function onContactMailTo(node) {
@@ -633,7 +638,7 @@ function newAbCallback(http) {
      ul.appendChild(li);
   }
   else
-    log ("ajax fuckage:" + http.status);
+    log ("ajax fuckage 4:" + http.status);
 }
 
 function onAddressBookAdd(event) {
@@ -649,7 +654,7 @@ function onAddressBookAdd(event) {
   var w = window.open(urlstr, "Addressbook",
                       "width=640,height=400,resizable=1,scrollbars=0");
   w.selector = selector;
-  w.opener = this;
+  w.opener = window;
   w.focus();
 
   event.preventDefault();