From d0bc0cba9d58c72b741e0e4c1f857a737c465118 Mon Sep 17 00:00:00 2001
From: Jared Wein <jwein@mozilla.com>
Date: Thu, 25 Jul 2013 16:03:13 -0400
Subject: [PATCH] Bug 898040 - Delay adding the event listeners for PanelUI
 until the panel is toggled. r=mconley

---
 .../customizableui/content/panelUI.js           | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/browser/components/customizableui/content/panelUI.js b/browser/components/customizableui/content/panelUI.js
index a9f035323ef..5865b94feb1 100644
--- a/browser/components/customizableui/content/panelUI.js
+++ b/browser/components/customizableui/content/panelUI.js
@@ -36,13 +36,23 @@ const PanelUI = {
         return this[getKey] = document.getElementById(id);
       });
     }
+  },
 
+  _eventListenersAdded: false,
+  _ensureEventListenersAdded: function() {
+    if (this._eventListenersAdded)
+      return;
+    this._addEventListeners();
+  },
+
+  _addEventListeners: function() {
     for (let event of this.kEvents) {
       this.panel.addEventListener(event, this);
     }
 
     this.helpView.addEventListener("ViewShowing", this._onHelpViewShow, false);
     this.helpView.addEventListener("ViewHiding", this._onHelpViewHide, false);
+    this._eventListenersAdded = true;
   },
 
   uninit: function() {
@@ -62,6 +72,7 @@ const PanelUI = {
    *        The mainView node to put back into place.
    */
   setMainView: function(aMainView) {
+    this._ensureEventListenersAdded();
     this.multiView.setMainView(aMainView);
   },
 
@@ -74,6 +85,7 @@ const PanelUI = {
    * @param aEvent the event that triggers the toggle.
    */
   toggle: function(aEvent) {
+    this._ensureEventListenersAdded();
     if (this.panel.state == "open") {
       this.hide();
     } else if (this.panel.state == "closed") {
@@ -150,6 +162,7 @@ const PanelUI = {
    * in that view.
    */
   showMainView: function() {
+    this._ensureEventListenersAdded();
     this.multiView.showMainView();
   },
 
@@ -158,6 +171,7 @@ const PanelUI = {
    * in that view.
    */
   showHelpView: function(aAnchor) {
+    this._ensureEventListenersAdded();
     this.multiView.showSubView("PanelUI-help", aAnchor);
   },
 
@@ -169,6 +183,7 @@ const PanelUI = {
    * @param aPlacementArea the CustomizableUI area that aAnchor is in.
    */
   showSubView: function(aViewId, aAnchor, aPlacementArea) {
+    this._ensureEventListenersAdded();
     let viewNode = document.getElementById(aViewId);
     if (!viewNode) {
       Cu.reportError("Could not show panel subview with id: " + aViewId);
@@ -239,6 +254,7 @@ const PanelUI = {
    * panels all at once. For performance, we ignore the mutations.
    */
   beginBatchUpdate: function() {
+    this._ensureEventListenersAdded();
     this.multiView.ignoreMutations = true;
   },
 
@@ -248,6 +264,7 @@ const PanelUI = {
    * container with whichever view is displayed if the panel is open.
    */
   endBatchUpdate: function(aReason) {
+    this._ensureEventListenersAdded();
     this.multiView.ignoreMutations = false;
   },