[Pkg-mozext-commits] [tabmixplus] 14/26: Remove support for Firefox 21

[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 13a170084b45a5b849f888851a17d33fbb6fcc07
Author: onemen <tabmix.onemen at gmail.com>
Date:   Sat Mar 12 20:02:33 2016 +0200

    Remove support for Firefox 21
---
 chrome/content/minit/tablib.js | 14 ++++++--------
 chrome/content/tab/tab.js      |  7 ++-----
 chrome/content/tabmix.js       |  6 ------
 modules/ContentClick.jsm       |  7 +------
 4 files changed, 9 insertions(+), 25 deletions(-)

diff --git a/chrome/content/minit/tablib.js b/chrome/content/minit/tablib.js
index f2e7954..eb30c55 100644
--- a/chrome/content/minit/tablib.js
+++ b/chrome/content/minit/tablib.js
@@ -536,14 +536,12 @@ var tablib = { // eslint-disable-line
       '  }'
     ).defineProperty();
 
-    if (Tabmix.isVersion(220)) {
-      Tabmix.changeCode(tabBar, "gBrowser.tabContainer._setPositionalAttributes")._replace(
-        /(\})(\)?)$/,
-        '          Tabmix.setTabStyle(this.selectedItem);\n' +
-        '          TabmixTabbar.updateBeforeAndAfter();\n' +
-        '$1$2'
-      ).toCode();
-    }
+    Tabmix.changeCode(tabBar, "gBrowser.tabContainer._setPositionalAttributes")._replace(
+      /(\})(\)?)$/,
+      '          Tabmix.setTabStyle(this.selectedItem);\n' +
+      '          TabmixTabbar.updateBeforeAndAfter();\n' +
+      '$1$2'
+    ).toCode();
   },
 
   change_utility: function change_utility() {
diff --git a/chrome/content/tab/tab.js b/chrome/content/tab/tab.js
index c86629f..42a7ec3 100644
--- a/chrome/content/tab/tab.js
+++ b/chrome/content/tab/tab.js
@@ -458,10 +458,7 @@ var TabmixTabbar = {
       let selectedIndex = visibleTabs.indexOf(selected);
       if (selectedIndex > 0)
         prev = visibleTabs[selectedIndex - 1];
-      if (Tabmix.isVersion(220))
-        next = tabBar._afterSelectedTab;
-      else if (selectedIndex < visibleTabs.length - 1)
-        next = visibleTabs[selectedIndex + 1];
+      next = tabBar._afterSelectedTab;
     }
 
     if (multibar) {
@@ -469,7 +466,7 @@ var TabmixTabbar = {
       tabRow = Tabmix.tabsUtils.getTabRowNumber(selected, topY);
     }
     updateAtt(prev, "beforeSelectedTab", "beforeselected", TabmixSvc.australis, "tabmix-");
-    updateAtt(next, "afterSelectedTab", "afterselected", Tabmix.isVersion(220), "");
+    updateAtt(next, "afterSelectedTab", "afterselected", true, "");
   },
 
   getRowHeight: function TMP_getRowHeight(tabsPosition) {
diff --git a/chrome/content/tabmix.js b/chrome/content/tabmix.js
index 792b278..508d6db 100644
--- a/chrome/content/tabmix.js
+++ b/chrome/content/tabmix.js
@@ -938,12 +938,6 @@ var TMP_eventListener = {
     if (tab.hasAttribute("showbutton") &&
         gBrowser.tabContainer.getAttribute("closebuttons") == "activetab")
       tab.style.removeProperty("width");
-
-    // tabBar.updateCurrentBrowser call tabBar._setPositionalAttributes after
-    // TabSelect event.
-    // Since Firefox 220 we call updateBeforeAndAfter from _setPositionalAttributes
-    if (!Tabmix.isVersion(220))
-      TabmixTabbar.updateBeforeAndAfter();
   },
 
   onTabMove: function TMP_EL_onTabMove(aEvent) {
diff --git a/modules/ContentClick.jsm b/modules/ContentClick.jsm
index df3f063..d15b236 100644
--- a/modules/ContentClick.jsm
+++ b/modules/ContentClick.jsm
@@ -454,12 +454,7 @@ ContentClickInternal = {
   contentLinkClick: function(event, browser, focusedWindow) {
     this._contentLinkClick(event, browser, focusedWindow);
     if (event.__hrefFromOnClick) {
-      if (TabmixSvc.version(220))
-        event.stopImmediatePropagation();
-      else {
-        event.stopPropagation();
-        browser.ownerDocument.defaultView.contentAreaClick(event);
-      }
+      event.stopImmediatePropagation();
     }
     this.resetData();
   },

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