From ecc36c9025b4b2717f5ce169b622648ccf02f410 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Fri, 1 Feb 2013 14:47:37 -0500
Subject: [PATCH] Fix classification menu in component editor

---
 NEWS                                        | 3 +++
 UI/WebServerResources/UIxComponentEditor.js | 4 +---
 UI/WebServerResources/generic.js            | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 0d3037ba8..fe413fc09 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,9 @@ Bug fixes
      4. SOGoDefaults.plist
  - Fixed handling of LDAP DN containing special characters (#2152, #2207)
  - Fixed handling of credential files for older GNUsteps (#2216)
+ - fixed tooltips in contacts list
+ - fixed classification menu in component editor
+ - fixed link to ACL editor for 'any authenticated user'
 
 2.0.4a (2013-01-30)
 ------------------
diff --git a/UI/WebServerResources/UIxComponentEditor.js b/UI/WebServerResources/UIxComponentEditor.js
index 88c564eec..1077fc5f0 100644
--- a/UI/WebServerResources/UIxComponentEditor.js
+++ b/UI/WebServerResources/UIxComponentEditor.js
@@ -200,9 +200,7 @@ function onComponentEditorLoad(event) {
     if (tmp) {
         var menuItems = tmp.childNodesWithTag("li");
         for (var i = 0; i < menuItems.length; i++)
-            menuItems[i].on("mousedown",
-                            onMenuSetClassification.bindAsEventListener(menuItems[i]),
-                            false);
+            menuItems[i].on("mousedown", onMenuSetClassification);
     }
 
     tmp = $("replyList");
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index 70c0e9e15..04b67c9fb 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -1238,7 +1238,7 @@ function popupToolbarMenu(node, menuId) {
                      visibility: "visible" });
 
     document.currentPopupMenu = popup;
-    $(document.body).observe("mouseup", onBodyClickMenuHandler);
+    $(document.body).on("mouseup", onBodyClickMenuHandler);
 }
 
 /* contact selector */