[Pkg-mozext-commits] [tabmixplus] 15/73: Add support to Tab Kit 2nd Edition

[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 eeb06999ce450941d678113b181300772100ca45
Author: onemen <tabmix.onemen at gmail.com>
Date:   Mon Mar 28 19:57:50 2016 +0300

    Add support to Tab Kit 2nd Edition
---
 chrome/content/extensions/extensions.js   | 4 +++-
 chrome/content/preferences/appearance.xul | 2 +-
 chrome/locale/en-US/pref-tabmix.dtd       | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/chrome/content/extensions/extensions.js b/chrome/content/extensions/extensions.js
index 8badcb9..5c97dc4 100644
--- a/chrome/content/extensions/extensions.js
+++ b/chrome/content/extensions/extensions.js
@@ -221,7 +221,9 @@ var TMP_extensionsCompatibility = {
   onWindowOpen: function TMP_EC_onWindowOpen() {
     // https://addons.mozilla.org/EN-US/firefox/addon/vertical-tabs/
     // https://addons.mozilla.org/EN-US/firefox/addon/side-tabs/
-    if (typeof VerticalTabs == "object" || typeof sidetabs == "object") {
+    // https://addons.mozilla.org/en-US/firefox/addon/tabkit-2nd-edition/
+    if (typeof VerticalTabs == "object" || typeof sidetabs == "object" ||
+        typeof tabkitGlobal == "object") {
       Tabmix.extensions.verticalTabs = true;
       Tabmix.extensions.verticalTabBar = true;
     }
diff --git a/chrome/content/preferences/appearance.xul b/chrome/content/preferences/appearance.xul
index ed5d92b..f5486fe 100644
--- a/chrome/content/preferences/appearance.xul
+++ b/chrome/content/preferences/appearance.xul
@@ -121,7 +121,7 @@
             <separator/>
             <description class="header" style="text-decoration: underline;color: #CC0000; width: &toolbar.description.width;"
                          hidden="true" id="treeStyleTab.msg">
-                &verticalTabbar.description;
+                &verticalTabbar.description1;
             </description>
             <!-- choose tab bar position -->
             <hbox align="center">
diff --git a/chrome/locale/en-US/pref-tabmix.dtd b/chrome/locale/en-US/pref-tabmix.dtd
index 91662c2..bac0a1f 100644
--- a/chrome/locale/en-US/pref-tabmix.dtd
+++ b/chrome/locale/en-US/pref-tabmix.dtd
@@ -137,7 +137,7 @@
 <!ENTITY dropIndicator.label "Drop indicator">
 <!ENTITY dropIndicator-native.label "Native style">
 <!ENTITY dropIndicator-builtin.label "Built-in style">
-<!ENTITY verticalTabbar.description "Use treeStyleTab or VerticalTab extension to control these preferences.">
+<!ENTITY verticalTabbar.description1 "These preferences are controlled by other extension that apply vertical tabs.">
 <!ENTITY tabBarPosition.label "Position:">
 <!ENTITY tabBarPosition.top.label "Top (above content)">
 <!ENTITY tabBarPosition.bottom.label "Bottom (below content)">

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