From fec7abbdba9bc85baa64a71e619e247f68802fcd Mon Sep 17 00:00:00 2001
From: "mozilla.mano%sent.com"
 <mozilla.mano%sent.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 20 Sep 2005 02:03:16 +0000
Subject: [PATCH] Bug 243235 - Remove Expand / Collapse bookmark folders UI.
 r=mconnor.

git-svn-id: svn://10.0.0.236/trunk@180627 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/browser/base/content/browser-sets.inc |  1 -
 .../components/bookmarks/content/bookmarks.js | 27 +++----------------
 .../bookmarks/content/bookmarksManager.xul    |  1 -
 .../bookmarks/content/bookmarksPanel.xul      |  1 -
 .../bookmarks/content/bookmarksTree.xml       |  3 ---
 5 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/mozilla/browser/base/content/browser-sets.inc b/mozilla/browser/base/content/browser-sets.inc
index 41d6c07b9b7..fdde7b4e3b1 100644
--- a/mozilla/browser/base/content/browser-sets.inc
+++ b/mozilla/browser/base/content/browser-sets.inc
@@ -72,7 +72,6 @@
     <command id="cmd_bm_open"                      oncommand="goDoCommand('cmd_bm_open');"/>
     <command id="cmd_bm_openinnewwindow"           oncommand="goDoCommand('cmd_bm_openinnewwindow');"/>
     <command id="cmd_bm_openinnewtab"              oncommand="goDoCommand('cmd_bm_openinnewtab');"/>
-    <command id="cmd_bm_expandfolder"              oncommand="goDoCommand('cmd_bm_expandfolder');"/>
     <command id="cmd_bm_openfolder"                oncommand="goDoCommand('cmd_bm_openfolder');"/>
     <command id="cmd_bm_managefolder"              oncommand="goDoCommand('cmd_bm_managefolder');"/>
     <command id="cmd_bm_newfolder"                 oncommand="goDoCommand('cmd_bm_newfolder');"/>
diff --git a/mozilla/browser/components/bookmarks/content/bookmarks.js b/mozilla/browser/components/bookmarks/content/bookmarks.js
index 25bc0031ac9..2be861d6e96 100644
--- a/mozilla/browser/components/bookmarks/content/bookmarks.js
+++ b/mozilla/browser/components/bookmarks/content/bookmarks.js
@@ -182,19 +182,6 @@ var BookmarksCommand = {
     xulElement.setAttribute("cmd", aCommandName);
     var cmd = "cmd_" + aCommandName.substring(gNC_NS_CMD.length);
     xulElement.setAttribute("command", cmd);
-    
-    if (aCommandName == gNC_NS_CMD + "bm_expandfolder") {
-      var shouldCollapse = true;
-      for (var i=0; i<aSelection.length; ++i)
-        if (!aSelection.isExpanded[i])
-          shouldCollapse = false;
-
-      if (shouldCollapse) {
-        aDisplayName = BookmarksUtils.getLocaleString("cmd_bm_collapsefolder");
-        aAccessKey   = BookmarksUtils.getLocaleString("cmd_bm_collapsefolder_accesskey");
-      }
-    }
-
     xulElement.setAttribute("label", aDisplayName);
     xulElement.setAttribute("accesskey", aAccessKey);
     return xulElement;
@@ -251,11 +238,8 @@ var BookmarksCommand = {
         popup.appendChild(element);
     }
 
-    switch (popup.firstChild.getAttribute("command")) {
-    case "cmd_bm_open":
-    case "cmd_bm_expandfolder":
+    if (popup.firstChild.getAttribute("command") == "cmd_bm_open")
       popup.firstChild.setAttribute("default", "true");
-    }
   },
   
   /////////////////////////////////////////////////////////////////////////////
@@ -307,7 +291,6 @@ var BookmarksCommand = {
     var commands = [];
     // menu order:
     // 
-    // bm_expandfolder
     // bm_open, bm_openfolder
     // bm_openinnewwindow
     // bm_openinnewtab
@@ -342,7 +325,7 @@ var BookmarksCommand = {
       break;
     case "Folder":
     case "PersonalToolbarFolder":
-      commands = ["bm_expandfolder", "bm_openfolder", "bm_managefolder", "bm_separator", 
+      commands = ["bm_openfolder", "bm_managefolder", "bm_separator", 
                   "bm_newbookmark", "bm_newfolder", "bm_newseparator", "bm_separator",
                   "cut", "copy", "paste", "bm_separator",
                   "delete", "bm_separator",
@@ -350,7 +333,7 @@ var BookmarksCommand = {
                   "bm_properties"];
       break;
     case "IEFavoriteFolder":
-      commands = ["bm_expandfolder", "bm_separator", "delete"];
+      commands = ["bm_separator", "delete"];
       break;
     case "IEFavorite":
       commands = ["bm_open", "bm_openinnewwindow", "bm_openinnewtab", "bm_separator",
@@ -361,7 +344,7 @@ var BookmarksCommand = {
                   "copy"];
       break;
     case "Livemark":
-      commands = ["bm_expandfolder", "bm_openfolder", "bm_separator",
+      commands = ["bm_openfolder", "bm_separator",
                   "cut", "copy", "bm_separator",
                   "delete", "bm_separator",
                   "bm_refreshlivemark", "bm_sortbyname", "bm_separator",
@@ -1033,7 +1016,6 @@ var BookmarksController = {
     case "cmd_bm_open":
     case "cmd_bm_openinnewwindow":
     case "cmd_bm_openinnewtab":
-    case "cmd_bm_expandfolder":
     case "cmd_bm_openfolder":
     case "cmd_bm_managefolder":
     case "cmd_bm_newbookmark":
@@ -1108,7 +1090,6 @@ var BookmarksController = {
     case "cmd_selectAll":
       return true;
     case "cmd_bm_open":
-    case "cmd_bm_expandfolder":
     case "cmd_bm_managefolder":
       return length == 1;
     case "cmd_bm_openinnewwindow":
diff --git a/mozilla/browser/components/bookmarks/content/bookmarksManager.xul b/mozilla/browser/components/bookmarks/content/bookmarksManager.xul
index 53464989f52..0bfaa537baa 100644
--- a/mozilla/browser/components/bookmarks/content/bookmarksManager.xul
+++ b/mozilla/browser/components/bookmarks/content/bookmarksManager.xul
@@ -76,7 +76,6 @@
   <command id="cmd_bm_open"                      oncommand="goDoCommand('cmd_bm_open');"/>
   <command id="cmd_bm_openinnewwindow"           oncommand="goDoCommand('cmd_bm_openinnewwindow');"/>
   <command id="cmd_bm_openinnewtab"              oncommand="goDoCommand('cmd_bm_openinnewtab');"/>
-  <command id="cmd_bm_expandfolder"              oncommand="goDoCommand('cmd_bm_expandfolder');"/>
   <command id="cmd_bm_openfolder"                oncommand="goDoCommand('cmd_bm_openfolder');"/>
   <command id="cmd_bm_managefolder"              oncommand="goDoCommand('cmd_bm_managefolder');"/>
   <command id="cmd_bm_newfolder"                 oncommand="goDoCommand('cmd_bm_newfolder');"/>
diff --git a/mozilla/browser/components/bookmarks/content/bookmarksPanel.xul b/mozilla/browser/components/bookmarks/content/bookmarksPanel.xul
index 3a60a2894df..c380f553ee3 100644
--- a/mozilla/browser/components/bookmarks/content/bookmarksPanel.xul
+++ b/mozilla/browser/components/bookmarks/content/bookmarksPanel.xul
@@ -60,7 +60,6 @@
   <command id="cmd_bm_open"            oncommand="goDoCommand('cmd_bm_open');"/>
   <command id="cmd_bm_openinnewwindow" oncommand="goDoCommand('cmd_bm_openinnewwindow');"/>
   <command id="cmd_bm_openinnewtab"    oncommand="goDoCommand('cmd_bm_openinnewtab');"/>
-  <command id="cmd_bm_expandfolder"    oncommand="goDoCommand('cmd_bm_expandfolder');"/>
   <command id="cmd_bm_openfolder"      oncommand="goDoCommand('cmd_bm_openfolder');"/>
   <command id="cmd_bm_managefolder"    oncommand="goDoCommand('cmd_bm_managefolder');"/>
   <command id="cmd_bm_newfolder"       oncommand="goDoCommand('cmd_bm_newfolder');"/>
diff --git a/mozilla/browser/components/bookmarks/content/bookmarksTree.xml b/mozilla/browser/components/bookmarks/content/bookmarksTree.xml
index bd8e63c8277..860c390fc68 100644
--- a/mozilla/browser/components/bookmarks/content/bookmarksTree.xml
+++ b/mozilla/browser/components/bookmarks/content/bookmarksTree.xml
@@ -641,9 +641,6 @@
           case "cmd_selectAll":
             this.mOuter.treeBoxObject.view.selection.selectAll();
             break;
-          case "cmd_bm_expandfolder":
-            this.mOuter.treeBoxObject.view.toggleOpenState(this.mOuter.currentIndex);
-            break;
           default:
             this.mOuter.saveSelection();
             BookmarksController.doCommand(aCommand, selection, target);