[Pkg-mozext-commits] [tabmixplus] 15/26: Remove support for Firefox 22

[David Prévot]

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

taffit pushed a commit to tag 0.4.2.3pre.160319a1
in repository tabmixplus.

commit 7c59a8a3d54c7fce40f1162234683e4f4e088045
Author: onemen <tabmix.onemen at gmail.com>
Date:   Sat Mar 12 22:37:25 2016 +0200

    Remove support for Firefox 22
---
 chrome/content/minit/tablib.js    | 12 ++++--------
 chrome/content/tab/tab.js         | 12 +-----------
 chrome/content/tabmix.js          |  8 +-------
 modules/Services.jsm              |  4 +---
 modules/SingleWindowModeUtils.jsm |  4 ----
 5 files changed, 7 insertions(+), 33 deletions(-)

diff --git a/chrome/content/minit/tablib.js b/chrome/content/minit/tablib.js
index eb30c55..dd4d474 100644
--- a/chrome/content/minit/tablib.js
+++ b/chrome/content/minit/tablib.js
@@ -447,17 +447,13 @@ var tablib = { // eslint-disable-line
       Tabmix.changeCode(tabBar._prefObserver, "gBrowser.tabContainer._prefObserver.observe")._replace(
         'this.tabContainer.mCloseButtons = Services.prefs.getIntPref(data);',
         'break;'
-      )._replace(
-        'this.tabContainer.updateVisibility();', '', {check: !Tabmix.isVersion(230)}
       ).toCode();
     }
 
-    if (Tabmix.isVersion(230)) {
-      Tabmix.changeCode(tabBar, "gBrowser.tabContainer.updateVisibility")._replace(
-        'window.toolbar.visible',
-        '$& && TabmixTabbar.hideMode == 0'
-      ).toCode();
-    }
+    Tabmix.changeCode(tabBar, "gBrowser.tabContainer.updateVisibility")._replace(
+      'window.toolbar.visible',
+      '$& && TabmixTabbar.hideMode == 0'
+    ).toCode();
 
     if (!Tabmix.extensions.verticalTabs) {
       Tabmix.changeCode(tabBar, "gBrowser.tabContainer._lockTabSizing")._replace(
diff --git a/chrome/content/tab/tab.js b/chrome/content/tab/tab.js
index 42a7ec3..9f021ac 100644
--- a/chrome/content/tab/tab.js
+++ b/chrome/content/tab/tab.js
@@ -1219,7 +1219,6 @@ gTMPprefObserver = {
       if (condition)
         this.OBSERVING.push(pref);
     }.bind(this);
-    addObserver("browser.tabs.autoHide", !Tabmix.isVersion(230));
     addObserver("layout.css.devPixelsPerPx", TabmixSvc.australis);
     addObserver("browser.tabs.onTop", !Tabmix.isVersion(290));
     addObserver("browser.tabs.closeButtons", !Tabmix.isVersion(310));
@@ -2076,16 +2075,7 @@ gTMPprefObserver = {
 
   setAutoHidePref: function() {
     TabmixTabbar.hideMode = Tabmix.prefs.getIntPref("hideTabbar");
-    if (Tabmix.isVersion(230)) {// after Bug 855370
-      gBrowser.tabContainer.updateVisibility();
-      return;
-    }
-    var autoHide = TabmixTabbar.hideMode !== 0;
-    if (autoHide != Services.prefs.getBoolPref("browser.tabs.autoHide")) {
-      Services.prefs.setBoolPref("browser.tabs.autoHide", autoHide);
-      if (TabmixTabbar.hideMode == 1)
-        gBrowser.tabContainer.updateVisibility();
-    }
+    gBrowser.tabContainer.updateVisibility();
   },
 
   setTabBarVisibility: function TMP_PO_setTabBarVisibility() {
diff --git a/chrome/content/tabmix.js b/chrome/content/tabmix.js
index 508d6db..e0eb546 100644
--- a/chrome/content/tabmix.js
+++ b/chrome/content/tabmix.js
@@ -525,13 +525,7 @@ var TMP_eventListener = {
     *  if browser.tabs.autoHide is true we need to make sure extensions.tabmix.hideTabbar
     *  is set to 1 "Hide tabbar when i have only one tab":
     */
-    if (!Tabmix.isVersion(230) &&
-        Services.prefs.getBoolPref("browser.tabs.autoHide") && TabmixTabbar.hideMode === 0) {
-      TabmixTabbar.hideMode = 1;
-      Tabmix.prefs.setIntPref("hideTabbar", TabmixTabbar.hideMode);
-    } else {
-      gTMPprefObserver.setAutoHidePref();
-    }
+    gTMPprefObserver.setAutoHidePref();
 
     if (TabmixTabbar.hideMode == 2)
       gBrowser.tabContainer.visible = false;
diff --git a/modules/Services.jsm b/modules/Services.jsm
index ca60fc5..2c0c96e 100644
--- a/modules/Services.jsm
+++ b/modules/Services.jsm
@@ -284,10 +284,8 @@ XPCOMUtils.defineLazyGetter(TabmixSvc, "australis", function() {
 });
 
 XPCOMUtils.defineLazyGetter(TabmixSvc, "prefs", function() {
-  let svc = isVersion(230) ? "resource://gre/modules/Preferences.jsm" :
-                             "resource://services-common/preferences.js";
   let tmp = {};
-  Cu.import(svc, tmp);
+  Cu.import("resource://gre/modules/Preferences.jsm", tmp);
   return new tmp.Preferences("");
 });
 
diff --git a/modules/SingleWindowModeUtils.jsm b/modules/SingleWindowModeUtils.jsm
index efc33e1..533cbf3 100644
--- a/modules/SingleWindowModeUtils.jsm
+++ b/modules/SingleWindowModeUtils.jsm
@@ -151,10 +151,6 @@ this.SingleWindowModeUtils = {
       // if we don't add this here BrowserShutdown fails
       newWindow.FullZoom.init = function() {};
       newWindow.FullZoom.destroy = function() {};
-      if (!TabmixSvc.version(230)) {
-        newWindow.PlacesStarButton.updateState = function() {};
-        newWindow.PlacesStarButton.uninit = function() {};
-      }
       newWindow.OfflineApps.uninit = function() {};
       newWindow.IndexedDBPromptHelper.init();
       var obs = Services.obs;

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