mozilla-inbound: changeset 250168:dbb2669057808e7f95d81b8a88e0c75aa0365269

author	Tim Taubert <ttaubert@mozilla.com>
	Mon, 15 Jun 2015 13:58:19 +0200
changeset 250168	dbb2669057808e7f95d81b8a88e0c75aa0365269
parent 250167	2555d8ffbd6b9d511e98110520dceaf3fa012dc9
child 250169	a810067a6cf19401bebf59d14a27b47abfb43973
push id	61471
push user	cbook@mozilla.com
push date	Thu, 25 Jun 2015 09:33:34 +0000
treeherder	mozilla-inbound@5b38df79819f [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	Gijs
bugs	1170759
milestone	41.0a1
first release with	nightly linux32 0b2f5e8b7be5 / 41.0a1 / 20150625030202 / files nightly linux64 0b2f5e8b7be5 / 41.0a1 / 20150625030202 / files nightly mac 0b2f5e8b7be5 / 41.0a1 / 20150625030202 / files nightly win32 0b2f5e8b7be5 / 41.0a1 / 20150625030202 / files nightly win64 0b2f5e8b7be5 / 41.0a1 / 20150625030202 / files
last release without	nightly linux32 4cdc1a95a672 / 41.0a1 / 20150624080416 / files nightly linux64 4cdc1a95a672 / 41.0a1 / 20150624080416 / files nightly mac 4cdc1a95a672 / 41.0a1 / 20150624080416 / files nightly win32 4cdc1a95a672 / 41.0a1 / 20150624080416 / files nightly win64 4cdc1a95a672 / 41.0a1 / 20150624080416 / files

--- a/browser/components/customizableui/content/panelUI.xml
+++ b/browser/components/customizableui/content/panelUI.xml
@@ -158,23 +158,17 @@
             evt.initCustomEvent("ViewHiding", true, true, viewNode);
             viewNode.dispatchEvent(evt);
 
             viewNode.removeAttribute("current");
             this._currentSubView = null;
 
             this._subViewObserver.disconnect();
 
-            this._transitioning = true;
-
-            this._viewContainer.addEventListener("transitionend", function trans() {
-              this._viewContainer.removeEventListener("transitionend", trans);
-              this._transitioning = false;
-            }.bind(this));
-            this._viewContainer.style.height = this._mainViewHeight + "px";
+            this._setViewContainerHeight(this._mainViewHeight);
 
             this.setAttribute("viewtype", "main");
           }
 
           this._shiftMainView();
         ]]></body>
       </method>
 
@@ -206,34 +200,44 @@
           //
           // All three of these actions make use of CSS transformations, so they
           // should all occur simultaneously.
           this.setAttribute("viewtype", "subview");
           this._shiftMainView(aAnchor);
 
           this._mainViewHeight = this._viewStack.clientHeight;
 
-          this._transitioning = true;
-          this._viewContainer.addEventListener("transitionend", function trans() {
-            this._viewContainer.removeEventListener("transitionend", trans);
-            this._transitioning = false;
-          }.bind(this));
-
           let newHeight = this._heightOfSubview(viewNode, this._subViews);
-          this._viewContainer.style.height = newHeight + "px";
+          this._setViewContainerHeight(newHeight);
 
           this._subViewObserver.observe(viewNode, {
             attributes: true,
             characterData: true,
             childList: true,
             subtree: true
           });
         ]]></body>
       </method>
 
+      <method name="_setViewContainerHeight">
+        <parameter name="aHeight"/>
+        <body><![CDATA[
+          let container = this._viewContainer;
+          this._transitioning = true;
+
+          let onTransitionEnd = () => {
+            container.removeEventListener("transitionend", onTransitionEnd);
+            this._transitioning = false;
+          };
+
+          container.addEventListener("transitionend", onTransitionEnd);
+          container.style.height = `${aHeight}px`;
+        ]]></body>
+      </method>
+
       <method name="_shiftMainView">
         <parameter name="aAnchor"/>
         <body><![CDATA[
           if (aAnchor) {
             // We need to find the edge of the anchor, relative to the main panel.
             // Then we need to add half the width of the anchor. This is the target
             // that we need to transition to.
             let anchorRect = aAnchor.getBoundingClientRect();