[Pkg-mozext-commits] [tabmixplus] 21/73: Update SingleWindowModeUtils.onload after bug 1186521

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository tabmixplus.

commit c336c39120089a00e1a7b431739e35f9bb4deaea
Author: onemen <tabmix.onemen at gmail.com>
Date:   Mon Apr 4 16:29:24 2016 +0300

    Update SingleWindowModeUtils.onload after bug 1186521
---
 .eslintrc                         | 1 +
 modules/SingleWindowModeUtils.jsm | 9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.eslintrc b/.eslintrc
index 30cb06c..8e8372b 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -326,6 +326,7 @@
         "openUILinkIn": false,
         "openURI": false,
         "OS": false,
+        "PanelUI": false,
         "PageThumbs": false,
         "PlacesCommandHook": false,
         "PlacesOrganizer": false,
diff --git a/modules/SingleWindowModeUtils.jsm b/modules/SingleWindowModeUtils.jsm
index 533cbf3..b3943e6 100644
--- a/modules/SingleWindowModeUtils.jsm
+++ b/modules/SingleWindowModeUtils.jsm
@@ -153,8 +153,15 @@ this.SingleWindowModeUtils = {
       newWindow.FullZoom.destroy = function() {};
       newWindow.OfflineApps.uninit = function() {};
       newWindow.IndexedDBPromptHelper.init();
-      var obs = Services.obs;
+      if (TabmixSvc.version(420)) {
+        newWindow.gMenuButtonBadgeManager.uninit = function() {
+          if (typeof PanelUI == "object" && PanelUI.panel) {
+            PanelUI.panel.removeEventListener("popupshowing", this, true);
+          }
+        };
+      }
       if (!TabmixSvc.version(440)) {
+        let obs = Services.obs;
         obs.addObserver(newWindow.gSessionHistoryObserver, "browser:purge-session-history", false);
         if (!TabmixSvc.version(340))
           obs.addObserver(newWindow.gFormSubmitObserver, "invalidformsubmit", false);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/tabmixplus.git