From e1dd0c3a16d6c0ee2a047b3159943d0ad96e9fa7 Mon Sep 17 00:00:00 2001
From: "kairo%kairo.at" <kairo%kairo.at@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 18 Oct 2006 12:47:12 +0000
Subject: [PATCH] bug 142215 - Personal Toolbar folders should work like main
 menu (open on mouseover), p=paradigmk@technodrome.com r=Neil a=me

git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@213776 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../browser/resources/content/navigator.xul   |  3 +++
 .../bookmarks/resources/bookmarksMenu.js      | 25 +++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/mozilla/xpfe/browser/resources/content/navigator.xul b/mozilla/xpfe/browser/resources/content/navigator.xul
index 963f6343892..f0f06f6f97e 100644
--- a/mozilla/xpfe/browser/resources/content/navigator.xul
+++ b/mozilla/xpfe/browser/resources/content/navigator.xul
@@ -262,6 +262,9 @@
   
     <toolbar id="PersonalToolbar" class="chromeclass-directories" persist="collapsed" 
              grippytooltiptext="&personalToolbar.tooltip;" tbalign="stretch" prefixhidden="true"
+             onmouseover="BookmarksToolbar.autoOpenMenu(event.target);"
+             onpopupshowing="BookmarksToolbar.onMenuOpen(event.target);"
+             onpopuphidden="BookmarksToolbar.onMenuClose(event.target);"
              ondraggesture="nsDragAndDrop.startDrag(event, BookmarksMenuDNDObserver)"
              ondragdrop="nsDragAndDrop.drop(event, BookmarksMenuDNDObserver); event.stopPropagation()"
              ondragenter="nsDragAndDrop.dragEnter(event, BookmarksMenuDNDObserver); event.stopPropagation()"
diff --git a/mozilla/xpfe/components/bookmarks/resources/bookmarksMenu.js b/mozilla/xpfe/components/bookmarks/resources/bookmarksMenu.js
index d409968d75c..8c50b2f1e27 100644
--- a/mozilla/xpfe/components/bookmarks/resources/bookmarksMenu.js
+++ b/mozilla/xpfe/components/bookmarks/resources/bookmarksMenu.js
@@ -724,6 +724,31 @@ var BookmarksMenuDNDObserver = {
 
 var BookmarksToolbar = 
 {
+  /////////////////////////////////////////////////////////////////////////////
+  // make bookmarks toolbar act like menus
+  openMenuButton: null,
+  autoOpenMenu: function (aTarget)
+  {
+    if (this.openMenuButton &&
+        this.openMenuButton != aTarget &&
+        aTarget.localName == "toolbarbutton" &&
+        (aTarget.type == "menu" ||
+         aTarget.type == "menu-button")) {
+      this.openMenuButton.open = false;
+      aTarget.open = true;
+    }
+  },
+  onMenuOpen: function (aTarget)
+  {
+    if (aTarget.parentNode.localName == "toolbarbutton")
+      this.openMenuButton = aTarget.parentNode;
+  },
+  onMenuClose: function (aTarget)
+  {
+    if (aTarget.parentNode.localName == "toolbarbutton")
+      this.openMenuButton = null;
+  },
+
   /////////////////////////////////////////////////////////////////////////////
   // returns the node of the last visible bookmark on the toolbar -->
   getLastVisibleBookmark: function ()