[Pkg-mozext-commits] [tabmixplus] 08/19: Follow up bug 1352119 - Implement new page loading indicator animation, part 1: update the throbber
David Prévot
taffit at moszumanska.debian.org
Tue Aug 29 08:05:14 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 8bf486b14f9eb6e244727166b3293f9fb41ab978
Author: onemen <tabmix.onemen at gmail.com>
Date: Thu Aug 24 16:05:33 2017 +0300
Follow up bug 1352119 - Implement new page loading indicator animation, part 1: update the throbber
---
chrome/content/tab/tab.js | 16 ---------
chrome/content/tab/tabBindings.xml | 66 +++++++++++++++++++++++++++++++++++++
chrome/content/tab/tabbrowser_4.xml | 4 ---
chrome/content/tabmix.js | 8 +++--
4 files changed, 71 insertions(+), 23 deletions(-)
diff --git a/chrome/content/tab/tab.js b/chrome/content/tab/tab.js
index 9ca5467..65e9499 100644
--- a/chrome/content/tab/tab.js
+++ b/chrome/content/tab/tab.js
@@ -2009,22 +2009,6 @@ gTMPprefObserver = {
newRule.style.setProperty("padding-bottom", (padding + 1) + "px", "important");
}, true);
}
-
- if (Tabmix.isVersion(570) && !TabmixSvc.australis) {
- newRule = `.tab-stack > .tab-background > .tab-background-start,
- .tab-stack > .tab-background > .tab-background-middle,
- .tab-stack > .tab-background > .tab-background-end {
- display: none;
- }`;
- this.insertRule(newRule);
- } else if (!Tabmix.isVersion(570)) {
- newRule = `.tab-stack > .tab-background > .tab-line,
- .tab-stack > .tab-background > .tabmix-tab-line-spacer,
- .tab-stack > .tab-background > .tab-bottom-line {
- display: none;
- }`;
- this.insertRule(newRule);
- }
},
updateStyleAttributes() {
diff --git a/chrome/content/tab/tabBindings.xml b/chrome/content/tab/tabBindings.xml
index bcf590f..3c9161d 100644
--- a/chrome/content/tab/tabBindings.xml
+++ b/chrome/content/tab/tabBindings.xml
@@ -138,4 +138,70 @@
</content>
</binding>
+ <binding id="tabmix-tabbrowser-tab-v57" 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:vbox xbl:inherits="selected=visuallyselected,fadein"
+ class="tab-background">
+ <xul:hbox xbl:inherits="selected=visuallyselected"
+ class="tab-line"/>
+ <xul:spacer flex="1"/>
+ <xul:hbox class="tab-bottom-line"/>
+ </xul:vbox>
+ <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:hbox xbl:inherits="fadein,pinned,busy,progress,selected=visuallyselected"
+ class="tab-throbber"
+ layer="true"/>
+ <xul:image xbl:inherits="src=image,loadingprincipal=iconLoadingPrincipal,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,soundplaying-scheduledremoval,pinned,muted,blocked,selected=visuallyselected,activemedia-blocked"
+ anonid="overlay-icon"
+ class="tab-icon-overlay"
+ role="presentation"/>
+ <xul:hbox class="tab-label-container"
+ xbl:inherits="pinned,selected=visuallyselected,labeldirection"
+ onoverflow="this.setAttribute('textoverflow', 'true');"
+ onunderflow="this.removeAttribute('textoverflow');"
+ flex="1">
+ <xul:label class="tab-text tab-label"
+ tabmix="true"
+ xbl:inherits="xbl:text=label,accesskey,fadein,pinned,selected=visuallyselected,attention"
+ role="presentation"/>
+ </xul:hbox>
+ <xul:image xbl:inherits="soundplaying,soundplaying-scheduledremoval,pinned,muted,blocked,selected=visuallyselected,activemedia-blocked"
+ 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 636b30f..c18335f 100644
--- a/chrome/content/tab/tabbrowser_4.xml
+++ b/chrome/content/tab/tabbrowser_4.xml
@@ -35,10 +35,6 @@
<xul:stack class="tab-stack" flex="1">
<xul:hbox xbl:inherits="pinned,selected=visuallyselected,fadein"
class="tab-background">
- <xul:hbox xbl:inherits="selected=visuallyselected"
- class="tab-line"/>
- <xul:spacer flex="1" class="tabmix-tab-line-spacer"/>
- <xul:hbox class="tab-bottom-line"/>
<xul:hbox xbl:inherits="pinned,selected=visuallyselected"
class="tab-background-start"/>
<xul:hbox xbl:inherits="pinned,selected=visuallyselected"
diff --git a/chrome/content/tabmix.js b/chrome/content/tabmix.js
index af5796b..3e3ba7b 100644
--- a/chrome/content/tabmix.js
+++ b/chrome/content/tabmix.js
@@ -341,6 +341,11 @@ var TMP_eventListener = {
},
onContentLoaded: function TMP_EL_onContentLoaded() {
+ if (Tabmix.isVersion(570)) {
+ let newRule = '.tabbrowser-tab {' +
+ '-moz-binding: url("chrome://tabmixplus/content/tab/tabBindings.xml#tabmix-tabbrowser-tab-v57") !important;}';
+ gTMPprefObserver.insertRule(newRule);
+ }
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;}';
@@ -1202,9 +1207,6 @@ var TMP_eventListener = {
}
updateAttrib("class", "tab-icon-image", "role", "presentation");
updateAttrib("class", "tab-text", "role", "presentation");
- if (Tabmix.isVersion(570)) {
- updateAttrib("class", "tab-background", "orient", "vertical");
- }
}
};
--
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