From 587ab7d5055d63db6b989aea6fb2b13a9b886d8c Mon Sep 17 00:00:00 2001
From: Gijs Kruitbosch <gijskruitbosch@gmail.com>
Date: Wed, 12 Feb 2014 14:54:35 +0000
Subject: [PATCH] Bug 971705 - fix Australis' panel's mainViewObserver to
 disconnect on popuphidden, r=mconley

--HG--
extra : rebase_source : 9e8a88a26ecb3b134504d2d112d290a7bcb0b44b
---
 .../customizableui/content/panelUI.xml           | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/browser/components/customizableui/content/panelUI.xml b/browser/components/customizableui/content/panelUI.xml
index c5df257944e..5510e9ed569 100644
--- a/browser/components/customizableui/content/panelUI.xml
+++ b/browser/components/customizableui/content/panelUI.xml
@@ -174,13 +174,6 @@
             this.setAttribute("viewtype", "main");
           }
 
-          this._mainViewObserver.observe(this._mainView, {
-            attributes: true,
-            characterData: true,
-            childList: true,
-            subtree: true
-          });
-
           this._shiftMainView();
         ]]></body>
       </method>
@@ -296,6 +289,14 @@
               // every time the popup closes, which is why we have to set it each time.
               this._panel.autoPosition = false;
               this._syncContainerWithMainView();
+
+              this._mainViewObserver.observe(this._mainView, {
+                attributes: true,
+                characterData: true,
+                childList: true,
+                subtree: true
+              });
+
               break;
             case "popupshown":
               this._setMaxHeight();
@@ -304,6 +305,7 @@
               this.removeAttribute("panelopen");
               this._mainView.style.removeProperty("height");
               this.showMainView();
+              this._mainViewObserver.disconnect();
               break;
           }
         ]]></body>