From e457042b36b00a43f850fdc1b28e4615abd889cd Mon Sep 17 00:00:00 2001 From: "dietrich%mozilla.com" Date: Wed, 5 Dec 2007 00:11:00 +0000 Subject: [PATCH] Bug 405237 deleting "Unfiled Bookmarks" or "bookmarks menu" folders breaks places organizer (should be undeletable) (r=dietrich) git-svn-id: svn://10.0.0.236/trunk@240462 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/browser/components/places/content/controller.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/mozilla/browser/components/places/content/controller.js b/mozilla/browser/components/places/content/controller.js index b8632ae9a3a..798ccfeeeea 100755 --- a/mozilla/browser/components/places/content/controller.js +++ b/mozilla/browser/components/places/content/controller.js @@ -278,7 +278,10 @@ PlacesController.prototype = { var nodes = this._view.getSelectionNodes(); var root = this._view.getResultNode(); + var bmFolderId = PlacesUtils.bookmarksMenuFolderId; + var ubFolderId = PlacesUtils.unfiledBookmarksFolderId; var btFolderId = PlacesUtils.toolbarFolderId; + for (var i = 0; i < nodes.length; ++i) { // Disallow removing the view's root node if (nodes[i] == root) @@ -286,7 +289,10 @@ PlacesController.prototype = { // Disallow removing the toolbar folder if (!aIsMoveCommand && - PlacesUtils.nodeIsFolder(nodes[i]) && nodes[i].itemId == btFolderId) + PlacesUtils.nodeIsFolder(nodes[i]) && + (nodes[i].itemId == btFolderId || + nodes[i].itemId == ubFolderId || + nodes[i].itemId == bmFolderId)) return false; // We don't call nodeIsReadOnly here, because nodeIsReadOnly means that