From 53cd3bf2e4f9d196eb7779f5077f1ceaf8ea659e Mon Sep 17 00:00:00 2001 From: "varga%netscape.com" Date: Tue, 1 Apr 2003 05:09:22 +0000 Subject: [PATCH] Quick fix for bug 199619. Cannot create new bookmark folders in "Manage Bookmarks" r=pch, sr=jag, a=asa git-svn-id: svn://10.0.0.236/trunk@140477 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpfe/components/bookmarks/resources/bookmarks.js | 3 +++ .../components/bookmarks/resources/bookmarksManager.js | 7 ++++++- .../xpfe/components/bookmarks/resources/bookmarksTree.xml | 2 -- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/mozilla/xpfe/components/bookmarks/resources/bookmarks.js b/mozilla/xpfe/components/bookmarks/resources/bookmarks.js index bb2867287c2..22cd61f9348 100644 --- a/mozilla/xpfe/components/bookmarks/resources/bookmarks.js +++ b/mozilla/xpfe/components/bookmarks/resources/bookmarks.js @@ -755,6 +755,9 @@ var BookmarksController = { isCommandEnabled: function (aCommand, aSelection, aTarget) { + if (aTarget.parent.Value == "NC:BookmarksTopRoot") + return false; + var item0, type0; var length = aSelection.length; if (length != 0) { diff --git a/mozilla/xpfe/components/bookmarks/resources/bookmarksManager.js b/mozilla/xpfe/components/bookmarks/resources/bookmarksManager.js index 1d32c40711d..84b18572657 100644 --- a/mozilla/xpfe/components/bookmarks/resources/bookmarksManager.js +++ b/mozilla/xpfe/components/bookmarks/resources/bookmarksManager.js @@ -28,8 +28,8 @@ function Startup() { const windowNode = document.getElementById("bookmark-window"); const bookmarksView = document.getElementById("bookmarks-view"); - bookmarksView.treeBoxObject.selection.select(0); + var rowIndex = 0; var titleString; // If we've been opened with a parameter, root the tree on it. @@ -54,8 +54,13 @@ function Startup() // always open the bookmark top root folder if (!bookmarksView.treeBoxObject.view.isContainerOpen(0)) bookmarksView.treeBoxObject.view.toggleOpenState(0); + if (!bookmarksView.treeBoxObject.view.isContainerEmpty(0)) + rowIndex = 1; } + bookmarksView.treeBoxObject.scrollToRow(rowIndex); + bookmarksView.treeBoxObject.selection.select(rowIndex); + windowNode.setAttribute("title", titleString); gBMtxmgr = BookmarksUtils.getTransactionManager(); diff --git a/mozilla/xpfe/components/bookmarks/resources/bookmarksTree.xml b/mozilla/xpfe/components/bookmarks/resources/bookmarksTree.xml index 042ace14dfa..1286deff283 100644 --- a/mozilla/xpfe/components/bookmarks/resources/bookmarksTree.xml +++ b/mozilla/xpfe/components/bookmarks/resources/bookmarksTree.xml @@ -321,8 +321,6 @@