gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-03-06 12:25:48 +01:00
Code Issues Projects Releases Wiki Activity

Use a different tab binding on FF36. Closes issue #41.

Browse Source
This commit is contained in:
Kris Maglione
2010-10-05 02:18:16 -04:00
parent 57fe3fe9eb
commit e592637c08
2 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
common/content/bindings.xml
View File

@@ -18,7 +18,30 @@
<content><html:span class="td-strut"/><html:span class="td-span"><children/></html:span></content> <content><html:span class="td-strut"/><html:span class="td-span"><children/></html:span></content>
</binding> </binding>
<binding id="tab" display="xul:hbox" <binding id="tab-3" display="xul:hbox"
extends="chrome://browser/content/tabbrowser.xml#tabbrowser-tab">
<content context="tabContextMenu" closetabtext="Close Tab">
<xul:stack class="tab-icon dactyl-tab-stack">
<xul:image xbl:inherits="validate,src=image" role="presentation"
class="tab-icon-image" dactyl:highlight="TabIcon"/>
<xul:vbox>
<xul:spring flex="1"/>
<xul:label xbl:inherits="value=ordinal" dactyl:highlight="TabIconNumber"/>
<xul:spring flex="1"/>
</xul:vbox>
</xul:stack>
<xul:label xbl:inherits="value=ordinal" dactyl:highlight="TabNumber"/>
<xul:label flex="1"
xbl:inherits="value=label,crop,accesskey"
class="tab-text" dactyl:highlight="TabText"
role="presentation"/>
<xul:toolbarbutton anonid="close-button"
tabindex="-1"
class="tab-close-button" dactyl:highlight="TabClose"/>
</content>
</binding>
<binding id="tab-4" display="xul:hbox"
extends="chrome://browser/content/tabbrowser.xml#tabbrowser-tab"> extends="chrome://browser/content/tabbrowser.xml#tabbrowser-tab">
<content context="tabContextMenu" closetabtext="Close Tab"> <content context="tabContextMenu" closetabtext="Close Tab">
<xul:stack class="tab-stack" flex="1"> <xul:stack class="tab-stack" flex="1">

11
common/content/tabs.js
View File

@@ -21,12 +21,13 @@ const Tabs = Module("tabs", {
this._lastBufferSwitchArgs = ""; this._lastBufferSwitchArgs = "";
this._lastBufferSwitchSpecial = true; this._lastBufferSwitchSpecial = true;
let fragment = dactyl.has("Darwin") ? "tab-mac" : "tab"; this.tabBinding = styles.addSheet(true, "tab-binding", "chrome://browser/content/browser.xul", String.replace(<![CDATA[
this.tabBinding = styles.addSheet(true, "tab-binding", "chrome://browser/content/browser.xul", xul|tab { -moz-binding: url(chrome://dactyl/content/bindings.xml#tab-3) !important; }
".tabbrowser-tab { -moz-binding: url(chrome://dactyl/content/bindings.xml#" + fragment + ") !important; }" + #TabsToolbar > xul|tabs > xul|tab { -moz-binding: url(chrome://dactyl/content/bindings.xml#tab-4) !important; }
// FIXME: better solution for themes? // FIXME: better solution for themes?
".tabbrowser-tab[busy] > .tab-icon > .tab-icon-image { list-style-image: url('chrome://global/skin/icons/loading_16.png') !important; }", .tabbrowser-tab[busy] > .tab-icon > .tab-icon-image { list-style-image: url('chrome://global/skin/icons/loading_16.png') !important; }
false, true); ]]>, /tab-./g, function (m) dactyl.has("Darwin") ? "tab-mac" : m),
false, true);
// hide tabs initially to prevent flickering when 'stal' would hide them // hide tabs initially to prevent flickering when 'stal' would hide them
// on startup // on startup