Bug 945753 - Australis should update currentset attribute with placements, not currentSet property, to avoid nixing non-existant items ourselves, r=mconley
☠☠ backed out by ae71523f056f ☠ ☠
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Tue, 03 Dec 2013 18:17:24 +0100
changeset 174131 35a8b1df1374fdd3ca5a3de74dde1970af563633
parent 174130 f096db1e9ddde5e4690480378a6731951b8d3f31
child 174132 0dfe710c2d6428131175d1f574f97174b07ce5f9
push id445
push userffxbld
push dateMon, 10 Mar 2014 22:05:19 +0000
treeherdermozilla-release@dc38b741b04e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmconley
bugs945753
milestone28.0a1
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
Bug 945753 - Australis should update currentset attribute with placements, not currentSet property, to avoid nixing non-existant items ourselves, r=mconley
browser/components/customizableui/src/CustomizableUI.jsm
--- a/browser/components/customizableui/src/CustomizableUI.jsm
+++ b/browser/components/customizableui/src/CustomizableUI.jsm
@@ -706,17 +706,17 @@ let CustomizableUIInternal = {
         if (widgetNode.getAttribute("type") == "wrap") {
           widgetNode.removeAttribute("type");
         }
         areaNode.toolbox.palette.appendChild(widgetNode);
       }
       this.notifyListeners("onWidgetAfterDOMChange", widgetNode, null, container, true);
 
       if (area.get("type") == CustomizableUI.TYPE_TOOLBAR) {
-        areaNode.setAttribute("currentset", areaNode.currentSet);
+        areaNode.setAttribute("currentset", gPlacements.get(aArea).join(','));
       }
 
       let windowCache = gSingleWrapperCache.get(window);
       if (windowCache) {
         windowCache.delete(aWidgetId);
       }
     }
   },
@@ -861,17 +861,17 @@ let CustomizableUIInternal = {
       }
     }
 
     let container = aAreaNode.customizationTarget;
     let [insertionContainer, nextNode] = this.findInsertionPoints(widgetNode, aNextNodeId, aAreaNode);
     this.insertWidgetBefore(widgetNode, nextNode, insertionContainer, areaId);
 
     if (gAreas.get(areaId).get("type") == CustomizableUI.TYPE_TOOLBAR) {
-      aAreaNode.setAttribute("currentset", aAreaNode.currentSet);
+      areaNode.setAttribute("currentset", gPlacements.get(areaId).join(','));
     }
   },
 
   findInsertionPoints: function(aNode, aNextNodeId, aAreaNode) {
     let props = gAreas.get(aAreaNode.id);
     if (props.get("type") == CustomizableUI.TYPE_TOOLBAR && props.get("overflowable") &&
         aAreaNode.getAttribute("overflowing") == "true") {
       return aAreaNode.overflowable.getOverflowedInsertionPoints(aNode, aNextNodeId);