From fb32a06fdccb469d1f6d18b39ef99d32ec8ceef7 Mon Sep 17 00:00:00 2001
From: "jaggernaut%netscape.com" <jaggernaut%netscape.com>
Date: Thu, 14 Sep 2006 06:03:42 +0000
Subject: [PATCH] Bug 119599: add UI for bookmark groups in the File Bookmark
 dialog. r=bryner, sr=hewitt, a=asa

---
 suite/browser/navigator.js         | 9 +++++++++
 suite/browser/navigator.xul        | 2 ++
 suite/browser/navigatorOverlay.xul | 5 +++--
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/suite/browser/navigator.js b/suite/browser/navigator.js
index fd437f393df..2b8dd98c15d 100644
--- a/suite/browser/navigator.js
+++ b/suite/browser/navigator.js
@@ -707,6 +707,15 @@ function OpenBookmarkURL(node, datasources)
     openDialog(getBrowserURL(), "_blank", "chrome,all,dialog=no", url);
 }
 
+function addBookmarkAs()
+{
+  const browsers = gBrowser.browsers;
+  if (browsers.length > 1)
+    BookmarksUtils.addBookmarkForTabBrowser(gBrowser);
+  else
+    BookmarksUtils.addBookmarkForBrowser(gBrowser.webNavigation, true);
+}
+
 function readRDFString(aDS,aRes,aProp)
 {
   var n = aDS.GetTarget(aRes, aProp, true);
diff --git a/suite/browser/navigator.xul b/suite/browser/navigator.xul
index 4519ce5bb8b..fcfa2b524d3 100644
--- a/suite/browser/navigator.xul
+++ b/suite/browser/navigator.xul
@@ -169,9 +169,11 @@ Contributor(s): ______________________________________. -->
                  onblur="URLBarBlurHandler(event);">
           <deck id="page-proxy-deck">
             <image id="page-proxy-button"
+                   onclick="BookmarksUtils.addBookmarkForBrowser(getBrowser().webNavigation, true);"
                    ondraggesture="PageProxyDragGesture(event);"
                    tooltiptext="&proxyIcon.tooltip;"/>
             <image id="page-proxy-favicon" validate="never"
+                   onclick="BookmarksUtils.addBookmarkForBrowser(getBrowser().webNavigation, true);"
                    ondraggesture="PageProxyDragGesture(event);"
                    onload="this.parentNode.selectedIndex = 1;
                            event.stopPropagation();
diff --git a/suite/browser/navigatorOverlay.xul b/suite/browser/navigatorOverlay.xul
index 09b0c83d139..3d2b9c5c7e7 100644
--- a/suite/browser/navigatorOverlay.xul
+++ b/suite/browser/navigatorOverlay.xul
@@ -144,8 +144,9 @@
     <!-- Bookmarks Menu -->
     <command id="Browser:AddBookmark" label="&addCurPageCmd.label;" accesskey="&addCurPageCmd.accesskey;" 
              oncommand="BookmarksUtils.addBookmarkForBrowser(document.getElementById('content').webNavigation, false);"/>
-    <command id="Browser:AddBookmarkAs" label="&addCurPageAsCmd.label;" accesskey="&addCurPageAsCmd.accesskey;" 
-             oncommand="BookmarksUtils.addBookmarkForBrowser(document.getElementById('content').webNavigation, true);"/>
+    <command id="Browser:AddBookmarkAs" label="&addCurPageAsCmd.label;"
+             accesskey="&addCurPageAsCmd.accesskey;"
+             oncommand="addBookmarkAs();"/>
     <command id="Browser:ManageBookmark" label="&manBookmarksCmd.label;" accesskey="&manBookmarksCmd.accesskey;" 
              oncommand="BrowserEditBookmarks();" />