From 731c43d0bf1646d02e6c93ceb0ac3ef61cd1aa9a Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Fri, 11 Mar 2011 16:04:14 +0000
Subject: [PATCH] See Changelog.

Monotone-Parent: da8145e67d54e8449cf6b3fe504e3e4c2d65ae45
Monotone-Revision: 1fa62d3040ac32204ac7c1db40ff1140e7dd5568

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-03-11T16:04:14
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                           | 7 +++++++
 UI/WebServerResources/ContactsUI.js | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b9e97fd42..6d8378e87 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-03-11  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/WebServerResources/ContactsUI.js (initContacts): don't define
+	the categories contextual menu if the contacts list doesn't
+	exist. This fixes a problem when adding categories to a contact
+	using IE7.
+
 2011-03-10  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* SoObjects/Appointments/SOGoAppointmentFolder.m (-fixupRecord):
diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js
index 5a71bb9ff..e7b0de6b3 100644
--- a/UI/WebServerResources/ContactsUI.js
+++ b/UI/WebServerResources/ContactsUI.js
@@ -1258,6 +1258,8 @@ function initContacts(event) {
         table.observe("mousedown", onContactSelectionChange);
         configureSortableTableHeaders(table);
         TableKit.Resizable.init(table, {'trueResize' : true, 'keepWidth' : true});
+
+        resetCategoriesMenu();
     }
         
     onWindowResize.defer();
@@ -1266,8 +1268,6 @@ function initContacts(event) {
     // Default sort options
     sorting["attribute"] = "c_cn";
     sorting["ascending"] = true;
-
-    resetCategoriesMenu();
 }
 
 function resetCategoriesMenu() {