From f5d951360d4a2abb9a121c529704017ddae1db50 Mon Sep 17 00:00:00 2001
From: "cbiesinger%web.de" <cbiesinger%web.de>
Date: Sat, 5 May 2007 04:36:34 +0000
Subject: [PATCH] Bug 159377       tab-group bookmark does nothing when no
 windows are open patch by durbacher@gmx.de (Andreas Kunz)  r=pch sr=alecf

---
 suite/common/bookmarks/bookmarks.js | 45 +++++++++++++++--------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/suite/common/bookmarks/bookmarks.js b/suite/common/bookmarks/bookmarks.js
index b1b3c2c39c4..e0e50b0876b 100644
--- a/suite/common/bookmarks/bookmarks.js
+++ b/suite/common/bookmarks/bookmarks.js
@@ -302,7 +302,7 @@ var BookmarksCommand = {
                   "bm_properties"];
       break;
     case "FolderGroup":
-      commands = ["bm_open", "bm_expandfolder", "bm_separator",
+      commands = ["bm_open", "bm_openinnewwindow", "bm_expandfolder", "bm_separator",
                   "bm_newfolder", "bm_sortfolder", "bm_sortfolderbyname", "bm_separator",
                   "bm_cut", "bm_copy", "bm_paste", "bm_movebookmark", "bm_separator",
                   "bm_rename", "bm_delete", "bm_separator",
@@ -571,30 +571,33 @@ var BookmarksCommand = {
 
   openGroupBookmark: function (aURI, aTargetBrowser)
   {
-    if (aTargetBrowser == "current" || aTargetBrowser == "tab") {
-      var w        = getTopWin();
-      var browser  = w.document.getElementById("content");
-      var resource = RDF.GetResource(aURI);
-      var urlArc   = RDF.GetResource(NC_NS+"URL");
-      RDFC.Init(BMDS, resource);
-      var containerChildren = RDFC.GetElements();
-      var tabPanels = browser.mPanelContainer.childNodes;
-      var tabCount  = tabPanels.length;
-      var index = 0;
-      var URIs = [];
-      while (containerChildren.hasMoreElements()) {
-        var res = containerChildren.getNext().QueryInterface(kRDFRSCIID);
-        var target = BMDS.GetTarget(res, urlArc, true);
-        if (target) {
-          URIs.push({ URI: target.QueryInterface(kRDFLITIID).Value });
-          ++index;
-        }
+    var w = getTopWin();
+    if (!w) // no browser window open, so we have to open in new window
+      aTargetBrowser="window";
+
+    var resource = RDF.GetResource(aURI);
+    var urlArc   = RDF.GetResource(NC_NS+"URL");
+    RDFC.Init(BMDS, resource);
+    var containerChildren = RDFC.GetElements();
+    var URIs = [];
+    while (containerChildren.hasMoreElements()) {
+      var res = containerChildren.getNext().QueryInterface(kRDFRSCIID);
+      var target = BMDS.GetTarget(res, urlArc, true);
+      if (target) {
+        if (aTargetBrowser == "window")
+          URIs.push(target.QueryInterface(kRDFLITIID).Value);
+        else
+          URIs.push({ URI: target.QueryInterface(kRDFLITIID).Value });        
       }
+    }
+    if (aTargetBrowser == "window") {
+      // This opens the URIs in separate tabs of a new window
+      openDialog(getBrowserURL(), "_blank", "chrome,all,dialog=no", URIs.join("\n"));
+    } else {
+      var browser = w.getBrowser();
       var tab = browser.loadGroup(URIs);
       if (!PREF.getBoolPref("browser.tabs.loadInBackground"))
         browser.selectedTab = tab;
-    } else {
-      dump("Open Group in new window: not implemented...\n");
     }
   },