From 2c35aa8ce085adf166cbc97f681c332aa89ece50 Mon Sep 17 00:00:00 2001 From: SHIMODA Hiroshi Date: Wed, 24 Aug 2011 10:27:12 +0900 Subject: [PATCH] update library for https://bugzilla.mozilla.org/show_bug.cgi?id=648668 (support blank favicon on Firefox 8 or later) --- content/treestyletab/res/tabFx2Compatible.css | 28 +++++++++++-------- content/treestyletab/res/tabFx2Compatible.xul | 4 ++- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/content/treestyletab/res/tabFx2Compatible.css b/content/treestyletab/res/tabFx2Compatible.css index aa403157..08b03b37 100644 --- a/content/treestyletab/res/tabFx2Compatible.css +++ b/content/treestyletab/res/tabFx2Compatible.css @@ -14,60 +14,64 @@ @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); -:root[tabFx2Compatible="14"] +:root[tabFx2Compatible="15"] .tabbrowser-tab { -moz-binding: url(tabFx2Compatible.xml#tabbrowser-tab-3) !important; } -:root[tabFx2Compatible="14"][tabFx2Compatible-flags~="separate-tabContextMenu"] +:root[tabFx2Compatible="15"][tabFx2Compatible-flags~="separate-tabContextMenu"] .tabbrowser-tab { -moz-binding: url(tabFx2Compatible.xml#tabbrowser-tab-4) !important; } -:root[tabFx2Compatible="14"]:not([tabFx2Compatible-flags~="png-throbber"])[tabFx2Compatible-flags~="fx3"] +:root[tabFx2Compatible="15"]:not([tabFx2Compatible-flags~="png-throbber"])[tabFx2Compatible-flags~="fx3"] .tab-icon-image[busy] { list-style-image: url("chrome://global/skin/throbber/Throbber-small.gif") !important; opacity: 0.6; } -:root[tabFx2Compatible="14"][tabFx2Compatible-flags~="png-throbber"][tabFx2Compatible-flags~="fx3"] +:root[tabFx2Compatible="15"][tabFx2Compatible-flags~="png-throbber"][tabFx2Compatible-flags~="fx3"] .tab-icon-image[busy] { list-style-image: url("chrome://global/skin/icons/loading_16.png") !important; } -:root[tabFx2Compatible="14"][tabFx2Compatible-flags~="mac"][tabFx2Compatible-flags~="png-throbber"] +:root[tabFx2Compatible="15"][tabFx2Compatible-flags~="mac"][tabFx2Compatible-flags~="png-throbber"] .tab-icon-image { list-style-image: url("chrome://global/skin/tree/item.png"); } +:root[tabFx2Compatible="15"][tabFx2Compatible-flags~="blank-favicon"] + .tab-icon-image { + list-style-image: url("chrome://mozapps/skin/places/defaultFavicon.png"); +} -:root[tabFx2Compatible="14"][tabFx2Compatible-flags~="mac"] +:root[tabFx2Compatible="15"][tabFx2Compatible-flags~="mac"] .tabbrowser-tab:not(:hover) .tab-icon-image:not([selected="true"]) { opacity: 0.6; } -:root[tabFx2Compatible="14"] +:root[tabFx2Compatible="15"] .tabbrowser-tab:focus > .tab-image-middle { outline: 1px dotted; } /* we must split declarations for old Gecko */ -:root[tabFx2Compatible="14"] +:root[tabFx2Compatible="15"] .tabbrowser-tab:-moz-focusring > .tab-stack { outline: 1px dotted; } -:root[tabFx2Compatible="14"] +:root[tabFx2Compatible="15"] .tab-image-left[pinned="true"], -:root[tabFx2Compatible="14"] +:root[tabFx2Compatible="15"] .tab-image-right[pinned="true"] { display: none !important; } /* Tab Utilities */ -:root[tabFx2Compatible="14"] +:root[tabFx2Compatible="15"] .tabbrowser-tabs[highlightLocked][highlightSelected][highlightUnread] > .tabbrowser-tab .tab-icon > .tab-icon-image ~ *, -:root[tabFx2Compatible="14"] +:root[tabFx2Compatible="15"] .tabbrowser-tabs[highlightlocked][highlightselected][highlightunread] > .tabbrowser-tab .tab-icon > .tab-icon-image ~ * { background: none !important; diff --git a/content/treestyletab/res/tabFx2Compatible.xul b/content/treestyletab/res/tabFx2Compatible.xul index 426c1b5f..b8477e50 100644 --- a/content/treestyletab/res/tabFx2Compatible.xul +++ b/content/treestyletab/res/tabFx2Compatible.xul @@ -19,7 +19,7 @@ window.addEventListener('DOMContentLoaded', function() { window.removeEventListener('DOMContentLoaded', arguments.callee, true); - const currentRevision = 14; + const currentRevision = 15; var b = document.getElementById('content'); if (!b || b.localName != 'tabbrowser') return; @@ -79,6 +79,8 @@ window.addEventListener('DOMContentLoaded', function() { flags.push('png-throbber'); if (Comparator.compare(XULAppInfo.version, '4.0b1') >= 0) flags.push('separate-tabContextMenu'); + if (Comparator.compare(XULAppInfo.version, '7.0') > 0) + flags.push('blank-favicon'); else flags.push('fx3'); root.setAttribute('tabFx2Compatible-flags', flags.join(' '));