Backed out changeset 5a6b95c47b55 (bug 1068671)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Wed, 01 Oct 2014 13:12:13 +0200
changeset 208169 7673c749c2c71996f8f5862977b2d0684ad96bfb
parent 208168 46db5df0e03f898aff35f46a0dba43bacd702bb4
child 208170 5b0fb54a17c62c8fe4ac463e1b2b9e498b6d53cd
push id27579
push userkwierso@gmail.com
push dateWed, 01 Oct 2014 23:02:13 +0000
treeherderautoland@f771fd927304 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1068671
milestone35.0a1
backs out5a6b95c47b5523a2f99959e2428688dacbfb9c10
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset 5a6b95c47b55 (bug 1068671)
browser/components/places/content/menu.xml
browser/components/places/content/treeView.js
--- a/browser/components/places/content/menu.xml
+++ b/browser/components/places/content/menu.xml
@@ -102,17 +102,17 @@
                   elt.lastChild.hasAttribute("placespopup"))
                 dropPoint.folderElt = elt;
               return dropPoint;
             }
 
             let tagName = PlacesUtils.nodeIsTagQuery(elt._placesNode) ?
                             elt._placesNode.title : null;
             if ((PlacesUtils.nodeIsFolder(elt._placesNode) &&
-                 !PlacesUIUtils.isContentsReadOnly(elt._placesNode)) ||
+                 !PlacesUIUtils.isContentsReadOnly(elt._placesNode) ||
                 PlacesUtils.nodeIsTagQuery(elt._placesNode)) {
               // This is a folder or a tag container.
               if (eventY - eltY < eltHeight * 0.20) {
                 // If mouse is in the top part of the element, drop above folder.
                 dropPoint.ip = new InsertionPoint(
                                     PlacesUtils.getConcreteItemId(resultNode),
                                     -1,
                                     Ci.nsITreeView.DROP_BEFORE,
--- a/browser/components/places/content/treeView.js
+++ b/browser/components/places/content/treeView.js
@@ -1669,19 +1669,19 @@ PlacesTreeView.prototype = {
     // * separators
     //
     // Note that concrete itemIds aren't used intentionally.  For example, we
     // have no reason to disallow renaming a shortcut to the Bookmarks Toolbar,
     // except for the one under All Bookmarks.
     if (PlacesUtils.nodeIsSeparator(node) || PlacesUtils.isRootItem(itemId))
       return false;
 
-    let parentId = PlacesUtils.getConcreteItemId(node.parent);
+    let parentId = node.parent.itemId;
     if (parentId == PlacesUIUtils.leftPaneFolderId ||
-        parentId == PlacesUIUtils.allBookmarksFolderId) {
+        parentId == PlacesUIUtils.allBallBookmarksFolderId) {
       // Note that the for the time being this is the check that actually
       // blocks renaming places "roots", and not the isRootItem check above.
       // That's because places root are only exposed through folder shortcuts
       // descendants of the left pane folder.
       return false;
     }
 
     return true;