[Pkg-mozext-commits] [tabmixplus] 63/147: Move tabbrowser-tab content for Firefox before 53 to separate file Changing tab attribute in is constructor is not a good solution since tab content reset its attributes to default when the tab moves
David Prévot
taffit at moszumanska.debian.org
Sat Aug 5 15:27:37 UTC 2017
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository tabmixplus.
commit 5711bb3eaff786fdd2bc26cbf16030af735e6ff7
Author: onemen <tabmix.onemen at gmail.com>
Date: Mon Dec 12 11:41:58 2016 +0200
Move tabbrowser-tab content for Firefox before 53 to separate file
Changing tab attribute in is constructor is not a good solution since tab content reset its attributes to default when the tab moves
---
chrome/content/tab/tabBindings.xml | 141 ++++++++++++++++++++++++++++++++++++
chrome/content/tab/tabbrowser_4.xml | 82 ---------------------
chrome/content/tabmix.js | 9 ++-
3 files changed, 148 insertions(+), 84 deletions(-)
diff --git a/chrome/content/tab/tabBindings.xml b/chrome/content/tab/tabBindings.xml
new file mode 100644
index 0000000..e550b19
--- /dev/null
+++ b/chrome/content/tab/tabBindings.xml
@@ -0,0 +1,141 @@
+<?xml version="1.0"?>
+
+<bindings id="tabmix-tab-bindings"
+ xmlns="http://www.mozilla.org/xbl"
+ xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+ xmlns:xbl="http://www.mozilla.org/xbl">
+
+ <binding id="tabmix-tab-label">
+ <content>
+ <xul:label flex="1"
+ xbl:inherits="value=visibleLabel,crop,accesskey,fadein,pinned,selected,visuallyselected,attention"
+ class="tab-text tab-label"
+ role="presentation"/>
+ </content>
+ </binding>
+
+ <binding id="tabmix-tabbrowser-tab-before-v51" display="xul:hbox"
+ extends="chrome://tabmixplus/content/tab/tabbrowser_4.xml#tabmix-tabbrowser-tab">
+ <content context="tabContextMenu">
+ <xul:hbox class="tab-image-left tab-startcap tab-left tab-left-border" xbl:inherits="selected,hover"/>
+ <xul:hbox class="tab-drag-indicator-left"/>
+ <xul:stack class="tab-stack" flex="1">
+ <xul:hbox xbl:inherits="pinned,selected,visuallyselected,titlechanged,fadein"
+ class="tab-background">
+ <xul:hbox xbl:inherits="pinned,selected,visuallyselected,titlechanged"
+ class="tab-background-start"/>
+ <xul:hbox xbl:inherits="pinned,selected,visuallyselected,titlechanged"
+ class="tab-background-middle"/>
+ <xul:hbox xbl:inherits="pinned,selected,visuallyselected,titlechanged"
+ class="tab-background-end"/>
+ </xul:hbox>
+ <xul:vbox class="tab-progress-container">
+ <xul:progressmeter class="tab-progress" mode="normal"
+ xbl:inherits="value=tab-progress,fadein,pinned,selected,visuallyselected"/>
+ </xul:vbox>
+ <xul:hbox xbl:inherits="pinned,selected,visuallyselected,titlechanged,attention"
+ class="tab-content" align="center">
+ <xul:stack class="tab-icon" xbl:inherits="fadein,pinned,selected,visuallyselected">
+ <xul:image xbl:inherits="fadein,pinned,busy,progress,selected,visuallyselected"
+ class="tab-throbber"
+ role="presentation"/>
+ <xul:image xbl:inherits="src=image,fadein,pinned,selected,visuallyselected,busy,crashed,sharing"
+ anonid="tab-icon-image"
+ class="tab-icon-image"
+ validate="never"
+ role="presentation"/>
+ <xul:image class="tab-protect-icon"/>
+ <xul:image class="tab-lock-icon"/>
+ <xul:image class="tab-reload-icon"/>
+ </xul:stack>
+ <xul:image xbl:inherits="sharing,selected"
+ anonid="sharing-icon"
+ class="tab-sharing-icon-overlay"
+ role="presentation"/>
+ <xul:image xbl:inherits="crashed,busy,soundplaying,pinned,muted,visuallyselected"
+ anonid="overlay-icon"
+ class="tab-icon-overlay"
+ role="presentation"/>
+ <xul:label flex="1"
+ anonid="tab-label" tabmix="true"
+ 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,visuallyselected"
+ anonid="soundplaying-icon"
+ class="tab-icon-sound"
+ role="presentation"/>
+ <xul:toolbarbutton anonid="tmp-close-button"
+ xbl:inherits="fadein,pinned,selected,visuallyselected"
+ class="tab-close-button close-icon"/>
+ </xul:hbox>
+ </xul:stack>
+ <xul:hbox class="tab-drag-indicator-right"/>
+ <xul:hbox class="tab-image-right tab-endcap tab-right tab-right-border" xbl:inherits="selected,hover"/>
+ </content>
+ </binding>
+
+ <binding id="tabmix-tabbrowser-tab-v51-52" display="xul:hbox"
+ extends="chrome://tabmixplus/content/tab/tabbrowser_4.xml#tabmix-tabbrowser-tab">
+ <content context="tabContextMenu">
+ <xul:hbox xbl:inherits="selected=visuallyselected,hover"
+ class="tab-image-left tab-startcap tab-left tab-left-border"/>
+ <xul:hbox class="tab-drag-indicator-left"/>
+ <xul:stack class="tab-stack" flex="1">
+ <xul:hbox xbl:inherits="pinned,selected=visuallyselected,titlechanged,fadein"
+ class="tab-background">
+ <xul:hbox xbl:inherits="pinned,selected=visuallyselected,titlechanged"
+ class="tab-background-start"/>
+ <xul:hbox xbl:inherits="pinned,selected=visuallyselected,titlechanged"
+ class="tab-background-middle"/>
+ <xul:hbox xbl:inherits="pinned,selected=visuallyselected,titlechanged"
+ class="tab-background-end"/>
+ </xul:hbox>
+ <xul:vbox class="tab-progress-container">
+ <xul:progressmeter class="tab-progress" mode="normal"
+ xbl:inherits="value=tab-progress,fadein,pinned,selected=visuallyselected"/>
+ </xul:vbox>
+ <xul:hbox xbl:inherits="pinned,selected=visuallyselected,titlechanged,attention"
+ class="tab-content" align="center">
+ <xul:stack class="tab-icon" xbl:inherits="fadein,pinned,selected=visuallyselected">
+ <xul:image xbl:inherits="fadein,pinned,busy,progress,selected=visuallyselected"
+ class="tab-throbber"
+ role="presentation"/>
+ <xul:image xbl:inherits="src=image,fadein,pinned,selected=visuallyselected,busy,crashed,sharing"
+ anonid="tab-icon-image"
+ class="tab-icon-image"
+ validate="never"
+ role="presentation"/>
+ <xul:image class="tab-protect-icon"/>
+ <xul:image class="tab-lock-icon"/>
+ <xul:image class="tab-reload-icon"/>
+ </xul:stack>
+ <xul:image xbl:inherits="sharing,selected=visuallyselected"
+ anonid="sharing-icon"
+ class="tab-sharing-icon-overlay"
+ role="presentation"/>
+ <xul:image xbl:inherits="crashed,busy,soundplaying,pinned,muted,selected=visuallyselected"
+ anonid="overlay-icon"
+ class="tab-icon-overlay"
+ role="presentation"/>
+ <xul:label flex="1"
+ anonid="tab-label" tabmix="true"
+ 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,selected=visuallyselected"
+ anonid="soundplaying-icon"
+ class="tab-icon-sound"
+ role="presentation"/>
+ <xul:toolbarbutton anonid="tmp-close-button"
+ xbl:inherits="fadein,pinned,selected=visuallyselected"
+ class="tab-close-button close-icon"/>
+ </xul:hbox>
+ </xul:stack>
+ <xul:hbox class="tab-drag-indicator-right"/>
+ <xul:hbox xbl:inherits="selected=visuallyselected,hover"
+ class="tab-image-right tab-endcap tab-right tab-right-border"/>
+ </content>
+ </binding>
+
+</bindings>
diff --git a/chrome/content/tab/tabbrowser_4.xml b/chrome/content/tab/tabbrowser_4.xml
index 9c50b61..e20ef46 100644
--- a/chrome/content/tab/tabbrowser_4.xml
+++ b/chrome/content/tab/tabbrowser_4.xml
@@ -26,76 +26,6 @@
</handlers>
</binding>
- <binding id="tabmix-tab-label">
- <content>
- <xul:label flex="1"
- xbl:inherits="value=visibleLabel,crop,accesskey,fadein,pinned,selected,visuallyselected,attention"
- class="tab-text tab-label"
- role="presentation"/>
- </content>
- </binding>
-
- <binding id="tabmix-tabbrowser-tab-before-v51" display="xul:hbox"
- extends="chrome://tabmixplus/content/tab/tabbrowser_4.xml#tabmix-tabbrowser-tab">
- <content context="tabContextMenu">
- <xul:hbox class="tab-image-left tab-startcap tab-left tab-left-border" xbl:inherits="selected,hover"/>
- <xul:hbox class="tab-drag-indicator-left"/>
- <xul:stack class="tab-stack" flex="1">
- <xul:hbox xbl:inherits="pinned,selected,visuallyselected,titlechanged,fadein"
- class="tab-background">
- <xul:hbox xbl:inherits="pinned,selected,visuallyselected,titlechanged"
- class="tab-background-start"/>
- <xul:hbox xbl:inherits="pinned,selected,visuallyselected,titlechanged"
- class="tab-background-middle"/>
- <xul:hbox xbl:inherits="pinned,selected,visuallyselected,titlechanged"
- class="tab-background-end"/>
- </xul:hbox>
- <xul:vbox class="tab-progress-container">
- <xul:progressmeter class="tab-progress" mode="normal"
- xbl:inherits="value=tab-progress,fadein,pinned,selected,visuallyselected"/>
- </xul:vbox>
- <xul:hbox xbl:inherits="pinned,selected,visuallyselected,titlechanged,attention"
- class="tab-content" align="center">
- <xul:stack class="tab-icon" xbl:inherits="fadein,pinned,selected,visuallyselected">
- <xul:image xbl:inherits="fadein,pinned,busy,progress,selected,visuallyselected"
- class="tab-throbber"
- role="presentation"/>
- <xul:image xbl:inherits="src=image,fadein,pinned,selected,visuallyselected,busy,crashed,sharing"
- anonid="tab-icon-image"
- class="tab-icon-image"
- validate="never"
- role="presentation"/>
- <xul:image class="tab-protect-icon"/>
- <xul:image class="tab-lock-icon"/>
- <xul:image class="tab-reload-icon"/>
- </xul:stack>
- <xul:image xbl:inherits="sharing,selected"
- anonid="sharing-icon"
- class="tab-sharing-icon-overlay"
- role="presentation"/>
- <xul:image xbl:inherits="crashed,busy,soundplaying,pinned,muted,visuallyselected"
- anonid="overlay-icon"
- class="tab-icon-overlay"
- role="presentation"/>
- <xul:label flex="1"
- anonid="tab-label" tabmix="true"
- 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,visuallyselected"
- anonid="soundplaying-icon"
- class="tab-icon-sound"
- role="presentation"/>
- <xul:toolbarbutton anonid="tmp-close-button"
- xbl:inherits="fadein,pinned,selected,visuallyselected"
- class="tab-close-button close-icon"/>
- </xul:hbox>
- </xul:stack>
- <xul:hbox class="tab-drag-indicator-right"/>
- <xul:hbox class="tab-image-right tab-endcap tab-right tab-right-border" xbl:inherits="selected,hover"/>
- </content>
- </binding>
-
<binding id="tabmix-tabbrowser-tab" display="xul:hbox"
extends="chrome://tabmixplus/content/tab/tabbrowser_proxy.xml#tabmix-tabbrowser-tab-proxy">
<content context="tabContextMenu">
@@ -148,12 +78,6 @@
xbl:inherits="xbl:text=label,accesskey,fadein,pinned,selected=visuallyselected,attention"
role="presentation"/>
</xul:hbox>
- <xul:label flex="1"
- hidden="true"
- anonid="tab-label" tabmix="true"
- 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,selected=visuallyselected"
anonid="soundplaying-icon"
class="tab-icon-sound"
@@ -178,12 +102,6 @@
let context = document.getElementById('context_closeTab');
this.setAttribute('closetabtext', context.getAttribute('label'));
}
- if (Tabmix.isVersion(510) && !Tabmix.isVersion(530)) {
- const tabLabel = document.getAnonymousElementByAttribute(this, "anonid", "tab-label");
- tabLabel.hidden = false;
- const tabLabelContainer = document.getAnonymousElementByAttribute(this, "class", "tab-label-container");
- tabLabelContainer.hidden = true;
- }
this.tabmix_inited = true;
]]>
</constructor>
diff --git a/chrome/content/tabmix.js b/chrome/content/tabmix.js
index 205337c..2790128 100644
--- a/chrome/content/tabmix.js
+++ b/chrome/content/tabmix.js
@@ -328,14 +328,19 @@ var TMP_eventListener = {
},
onContentLoaded: function TMP_EL_onContentLoaded() {
+ if (Tabmix.isVersion(510) && !Tabmix.isVersion(530)) {
+ let newRule = '.tabbrowser-tab {' +
+ '-moz-binding: url("chrome://tabmixplus/content/tab/tabBindings.xml#tabmix-tabbrowser-tab-v51-52") !important;}';
+ gTMPprefObserver.insertRule(newRule);
+ }
if (!Tabmix.isVersion(510)) {
let newRule = '.tabbrowser-tab {' +
- '-moz-binding: url("chrome://tabmixplus/content/tab/tabbrowser_4.xml#tabmix-tabbrowser-tab-before-v51") !important;}';
+ '-moz-binding: url("chrome://tabmixplus/content/tab/tabBindings.xml#tabmix-tabbrowser-tab-before-v51") !important;}';
gTMPprefObserver.insertRule(newRule);
}
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;}';
+ '-moz-binding: url("chrome://tabmixplus/content/tab/tabBindings.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
More information about the Pkg-mozext-commits
mailing list