Bug 401333 - Can't expand folder tree of Edit bookmark dialog. r=sspitzer, a=mconnor.

browser/components/places/content/editBookmarkOverlay.js

@@ -571,12 +571,29 @@ var gEditItemOverlay = {
       expander.className = "expander-up"
       expander.setAttribute("tooltiptext",
                             expander.getAttribute("tooltiptextup"));
-      if (!this._folderTree.treeBoxObject.view.isContainerOpen(0))
-        this._folderTree.treeBoxObject.view.toggleOpenState(0);
-      this._folderTree.selectFolders([this._getFolderIdFromMenuList()]);
       this._folderTree.collapsed = false;
+      if (!this._folderTree.place) {
+        const FOLDER_TREE_PLACE_URI =
+          "place:folder=2&excludeItems=1&excludeQueries=1&excludeReadOnlyFolders=1";
+        this._folderTree.place = FOLDER_TREE_PLACE_URI;
+      }
+
+      var currentFolder = this._getFolderIdFromMenuList();
+      // Don't select anything in the tree if the item is "unfiled"
+      if (currentFolder == PlacesUtils.unfiledRootId)
+        this._folderTree.selectFolders([]);
+      else {
+        this._folderTree.selectFolders([currentFolder]);
         this._folderTree.focus();
       }
+
+      if ((currentFolder == PlacesUtils.bookmarksRootId ||
+           currentFolder == PlacesUtils.unfiledRootId) &&
+          !this._folderTree.treeBoxObject.view.isContainerOpen(0)) {
+        // Expand the root node if selectFolder didn't
+        this._folderTree.treeBoxObject.view.toggleOpenState(0);
+      }
+    }
   },
 
   _getFolderIdFromMenuList:

browser/components/places/content/editBookmarkOverlay.xul

@@ -144,7 +144,6 @@
               collapsed="true"
               onselect="gEditItemOverlay.onFolderTreeSelect();"
               showRoot="true"
-              place="place:folder=2&excludeItems=1&excludeQueries=1&excludeReadOnlyFolders=1"
               hidecolumnpicker="true"
               observes="paneElementsBroadcaster">
           <treecols>

browser/components/places/content/tree.xml

@@ -78,11 +78,13 @@
           var resultview = this.getResultView();
           if (resultview)
             resultview.removeViewObserver(this._viewObserver);
+
           this.treeBoxObject.view = val;
           if (val) {
             val.QueryInterface(Ci.nsINavHistoryResultViewer)
                .addViewObserver(this._viewObserver, false);
           }
+          return val;
         ]]></setter>
       </property>