stonewareslord/treestyletab
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

on Linux, appmenu in the tab bar and other toolbar items inserted before the tabs element were wrongly moved after the tabs element.

Browse Source
This commit is contained in:
SHIMODA Hiroshi 2011-03-16 20:12:37 +09:00
parent e55f22c7b7
commit 8779e2ecde
2 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
content/treestyletab/treestyletab.css
View File

@ -217,32 +217,34 @@ toolbar.treestyletab-tabbar-toolbar[treestyletab-mode="vertical"]
} }
@media all and (-moz-windows-compositor) { @media all and (-moz-windows-compositor) {
#navigator-toolbox[tabsontop="true"] > .treestyletab-tabbar-toolbar, #navigator-toolbox[tabsontop="true"]
#navigator-toolbox[tabsontop="true"] > .treestyletab-tabbar-toolbar:-moz-lwtheme, > :-moz-any(.treestyletab-tabbar-toolbar,
.treestyletab-tabbar-toolbar:-moz-lwtheme,
.treestyletab-tabbar-toolbar-ready,
.treestyletab-tabbar-toolbar-ready:-moz-lwtheme),
#navigator-toolbox #navigator-toolbox
> #nav-bar + #customToolbars > #nav-bar + #customToolbars
+ #PersonalToolbar[collapsed="true"] + #PersonalToolbar[collapsed="true"]
+ .treestyletab-tabbar-toolbar[tabsontop="true"]:last-child, + :-moz-any(.treestyletab-tabbar-toolbar[tabsontop="true"]:last-child,
#navigator-toolbox .treestyletab-tabbar-toolbar[tabsontop="true"]:not(:last-child),
> #nav-bar + #customToolbars .treestyletab-tabbar-toolbar[tabsontop="false"]:last-child,
+ #PersonalToolbar[collapsed="true"] .treestyletab-tabbar-toolbar[tabsontop="false"]:not(:last-child),
+ .treestyletab-tabbar-toolbar[tabsontop="true"]:not(:last-child), .treestyletab-tabbar-toolbar-ready[tabsontop="true"]:last-child,
#navigator-toolbox .treestyletab-tabbar-toolbar-ready[tabsontop="true"]:not(:last-child),
> #nav-bar + #customToolbars .treestyletab-tabbar-toolbar-ready[tabsontop="false"]:last-child,
+ #PersonalToolbar[collapsed="true"] .treestyletab-tabbar-toolbar-ready[tabsontop="false"]:not(:last-child)) {
+ .treestyletab-tabbar-toolbar[tabsontop="false"]:last-child,
#navigator-toolbox
> #nav-bar + #customToolbars
+ #PersonalToolbar[collapsed="true"]
+ .treestyletab-tabbar-toolbar[tabsontop="false"]:not(:last-child) {
-moz-binding: url(treestyletab.xml#toolbar-drag); -moz-binding: url(treestyletab.xml#toolbar-drag);
} }
} }
.treestyletab-tabbar-toolbar { .treestyletab-tabbar-toolbar,
.treestyletab-tabbar-toolbar-ready {
-moz-binding: url(treestyletab.xml#toolbar-drag); -moz-binding: url(treestyletab.xml#toolbar-drag);
} }
#navigator-toolbox[tabsontop="false"] > .treestyletab-tabbar-toolbar, #navigator-toolbox[tabsontop="false"]
#navigator-toolbox[tabsontop="false"] > .treestyletab-tabbar-toolbar:-moz-lwtheme { > :-moz-any(.treestyletab-tabbar-toolbar,
.treestyletab-tabbar-toolbar-ready,
.treestyletab-tabbar-toolbar:-moz-lwtheme,
.treestyletab-tabbar-toolbar-ready:-moz-lwtheme) {
-moz-binding: url(treestyletab.xml#toolbar); -moz-binding: url(treestyletab.xml#toolbar);
} }
.treestyletab-tabbar-toolbar:not([treestyletab-tabbar-position="top"]), .treestyletab-tabbar-toolbar:not([treestyletab-tabbar-position="top"]),

10
content/treestyletab/treestyletabbrowser.js
View File

@ -1769,7 +1769,9 @@ TreeStyleTabBrowser.prototype = {
this.removeTabStripAttribute('ordinal'); this.removeTabStripAttribute('ordinal');
this.removeTabStripAttribute('orient'); this.removeTabStripAttribute('orient');
this.destroyTabStrip(this.ownerToolbar); var toolbar = this.ownerToolbar;
this.destroyTabStrip(toolbar);
toolbar.classList.add(this.kTABBAR_TOOLBAR_READY);
this._endListenTabbarEvents(); this._endListenTabbarEvents();
@ -1795,8 +1797,8 @@ TreeStyleTabBrowser.prototype = {
{ {
this.stopRendering(); this.stopRendering();
this.ownerToolbar.classList.remove(this.kTABBAR_TOOLBAR_READY);
this.ownerToolbar.classList.add(this.kTABBAR_TOOLBAR); this.ownerToolbar.classList.add(this.kTABBAR_TOOLBAR);
this.ownerToolbar.classList.remove(this.kTABBAR_TOOLBAR_READY);
Array.slice(document.querySelectorAll('.'+this.kTABBAR_TOOLBAR_READY_POPUP)) Array.slice(document.querySelectorAll('.'+this.kTABBAR_TOOLBAR_READY_POPUP))
.forEach(function(aPanel) { .forEach(function(aPanel) {
this.safeRemovePopup(aPanel); this.safeRemovePopup(aPanel);
@ -1827,6 +1829,8 @@ TreeStyleTabBrowser.prototype = {
updateCustomizedTabsToolbar : function TSTBrowser_updateCustomizedTabsToolbar() updateCustomizedTabsToolbar : function TSTBrowser_updateCustomizedTabsToolbar()
{ {
var newToolbar = this.ownerToolbar; var newToolbar = this.ownerToolbar;
newToolbar.classList.add(this.kTABBAR_TOOLBAR_READY);
var oldToolbar = document.querySelector('.'+this.kTABBAR_TOOLBAR_READY); var oldToolbar = document.querySelector('.'+this.kTABBAR_TOOLBAR_READY);
if (oldToolbar == newToolbar) if (oldToolbar == newToolbar)
return; return;
@ -1836,8 +1840,6 @@ TreeStyleTabBrowser.prototype = {
oldToolbar.classList.remove(this.kTABBAR_TOOLBAR_READY); oldToolbar.classList.remove(this.kTABBAR_TOOLBAR_READY);
} }
newToolbar.classList.add(this.kTABBAR_TOOLBAR_READY);
var id = newToolbar.id+'-'+this.kTABBAR_TOOLBAR_READY_POPUP; var id = newToolbar.id+'-'+this.kTABBAR_TOOLBAR_READY_POPUP;
var panel = document.getElementById(id); var panel = document.getElementById(id);
if (!panel) { if (!panel) {