Backed out changeset 35a8b1df1374 (bug 945753)
authorMike Conley <mconley@mozilla.com>
Tue, 03 Dec 2013 23:24:21 -0500
changeset 174153 ae71523f056f933cdab919b524bb11b07ef53df4
parent 174152 2d8d7315717fa60d800483e0bb28ffb898ca709e
child 174154 e970d7fcd33c3939ffe64d291684c523f2825ada
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)
bugs945753
milestone28.0a1
backs out35a8b1df1374fdd3ca5a3de74dde1970af563633
Backed out changeset 35a8b1df1374 (bug 945753)
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", gPlacements.get(aArea).join(','));
+        areaNode.setAttribute("currentset", areaNode.currentSet);
       }
 
       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) {
-      areaNode.setAttribute("currentset", gPlacements.get(areaId).join(','));
+      aAreaNode.setAttribute("currentset", aAreaNode.currentSet);
     }
   },
 
   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);