[Pkg-mozext-commits] [tabmixplus] 13/23: Follow uo bug 1247920 - Remove tabs' visibleLabel property and TabLabelModified event

[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 dc5c1a4fddbf5ec43d3a667661fcc02a6b97561b
Author: onemen <tabmix.onemen at gmail.com>
Date:   Sun Feb 14 19:37:13 2016 +0200

    Follow uo bug 1247920 - Remove tabs' visibleLabel property and TabLabelModified event
---
 chrome/content/tab/tabbrowser_4.xml | 4 ++--
 chrome/content/tabmix.js            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/chrome/content/tab/tabbrowser_4.xml b/chrome/content/tab/tabbrowser_4.xml
index 54c3def..002e464 100644
--- a/chrome/content/tab/tabbrowser_4.xml
+++ b/chrome/content/tab/tabbrowser_4.xml
@@ -29,7 +29,7 @@
   <binding id="tabmix-tab-label">
     <content>
       <xul:label flex="1"
-                 xbl:inherits="value=labelvalue,crop,accesskey,fadein,pinned,selected,visuallyselected,attention"
+                 xbl:inherits="value=visibleLabel,crop,accesskey,fadein,pinned,selected,visuallyselected,attention"
                  class="tab-text tab-label"
                  role="presentation"/>
     </content>
@@ -75,7 +75,7 @@
                      role="presentation"/>
           <xul:label flex="1"
                      anonid="tab-label" tabmix="true"
-                     xbl:inherits="value=visibleLabel,labelvalue=label,crop,accesskey,fadein,pinned,selected,visuallyselected,attention"
+                     xbl:inherits="value=label,visibleLabel,crop,accesskey,fadein,pinned,selected,visuallyselected,attention"
                      class="tab-text tab-label"
                      role="presentation"/>
           <xul:image xbl:inherits="soundplaying,pinned,muted"
diff --git a/chrome/content/tabmix.js b/chrome/content/tabmix.js
index 1532c50..a75ec2e 100644
--- a/chrome/content/tabmix.js
+++ b/chrome/content/tabmix.js
@@ -324,7 +324,7 @@ var TMP_eventListener = {
   },
 
   onContentLoaded: function TMP_EL_onContentLoaded() {
-    if (!Tabmix.isVersion(280)) {
+    if (Tabmix.isVersion(280) && !Tabmix.isVersion(470)) {
       let newRule = '.tabbrowser-tab > .tab-stack > .tab-content > .tab-label[tabmix="true"] {' +
         '-moz-binding: url("chrome://tabmixplus/content/tab/tabbrowser_4.xml#tabmix-tab-label") !important;}';
       gTMPprefObserver.insertRule(newRule);

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