Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 405237 deleting "Unfiled Bookmarks" or "bookmarks menu" folders breaks places organizer (should be undeletable) (r=dietrich)

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@240462 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dietrich%mozilla.com
2007-12-05 00:11:00 +00:00
parent a2378acf8c
commit e457042b36
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/browser/components/places/content/controller.js
View File

@@ -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