・Firefox 3対応

・標準テーマをMixedに変更

git-svn-id: http://www.cozmixng.org/repos/piro/treestyletab/trunk@1278 599a83e7-65a4-db11-8015-0010dcdd6dc2
This commit is contained in:
piro 2007-10-21 23:38:50 +00:00
parent 1674c9ae53
commit f5ba2f57cd
7 changed files with 37 additions and 27 deletions

View File

@ -24,6 +24,7 @@ tab[treestyletab-collapsed="true"],
tabbrowser[treestyletab-vertical="true"] .tabbrowser-arrowscrollbox > .scrollbutton-up,
tabbrowser[treestyletab-vertical="true"] .tabbrowser-arrowscrollbox > .scrollbutton-down-stack,
tabbrowser[treestyletab-vertical="true"] .tabs-alltabs-stack,
tabbrowser[treestyletab-vertical="true"] .tabbrowser-arrowscrollbox + stack, /* "all tabs" button in Firefox 3 */
tabbrowser[treestyletab-vertical="true"] .tabs-closebutton-box,
tabbrowser[treestyletab-vertical="true"] .tab-drop-indicator-bar
{

View File

@ -326,8 +326,10 @@ var TreeStyleTabService = {
aTabBrowser.__treestyletab__levelMargin = -1;
eval('aTabBrowser.mTabContainer.selectNewTab = '+
aTabBrowser.mTabContainer.selectNewTab.toSource().replace(
var selectNewTab = '_selectNewTab' in aTabBrowser.mTabContainer ? '_selectNewTab' : 'selectNewTab' ; // Fx3 / Fx2
eval('aTabBrowser.mTabContainer.'+selectNewTab+' = '+
aTabBrowser.mTabContainer[selectNewTab].toSource().replace(
/\{/,
<><![CDATA[
{
@ -355,7 +357,10 @@ var TreeStyleTabService = {
nextTab = xpathResult.snapshotItem(aDir < 0 ? xpathResult.snapshotLength-1 : 0 );
}
if (nextTab && nextTab != aSelf.selectedItem) {
aSelf.selectNewTab(nextTab, aDir, aWrap);
if ('_selectNewTab' in aSelf)
aSelf._selectNewTab(nextTab, aDir, aWrap); // Fx 3
else
aSelf.selectNewTab(nextTab, aDir, aWrap); // Fx 2
}
})(arguments[0], arguments[1], this);
return;
@ -757,24 +762,26 @@ catch(e) {
window.QueryInterface(Components.interfaces.nsIDOMChromeWindow).browserDOMWindow = null;
window.QueryInterface(Components.interfaces.nsIDOMChromeWindow).browserDOMWindow = new nsBrowserAccess();
eval('BookmarksCommand.openGroupBookmark = '+
BookmarksCommand.openGroupBookmark.toSource().replace(
'browser.addTab(uri);',
<><![CDATA[
var openedTab = browser.addTab(uri);
if (!TreeStyleTabService.getPref('browser.tabs.loadFolderAndReplace') &&
TreeStyleTabService.getPref('extensions.treestyletab.openGroupBookmarkAsTabSubTree') &&
!browser.__treestyletab__parentTab) {
TreeStyleTabService.readyToOpenChildTab(openedTab, true);
}
]]></>
).replace(
'if (index == index0)',
<><![CDATA[
TreeStyleTabService.stopToOpenChildTab(browser);
if (index == index0)]]></>
)
);
if ('BookmarksCommand' in window) {
eval('BookmarksCommand.openGroupBookmark = '+
BookmarksCommand.openGroupBookmark.toSource().replace(
'browser.addTab(uri);',
<><![CDATA[
var openedTab = browser.addTab(uri);
if (!TreeStyleTabService.getPref('browser.tabs.loadFolderAndReplace') &&
TreeStyleTabService.getPref('extensions.treestyletab.openGroupBookmarkAsTabSubTree') &&
!browser.__treestyletab__parentTab) {
TreeStyleTabService.readyToOpenChildTab(openedTab, true);
}
]]></>
).replace(
'if (index == index0)',
<><![CDATA[
TreeStyleTabService.stopToOpenChildTab(browser);
if (index == index0)]]></>
)
);
}
},
destroy : function()

View File

@ -2,7 +2,7 @@ pref("extensions.treestyletab.tabbar.width", 200);
pref("extensions.treestyletab.tabbar.position", "left");
pref("extensions.treestyletab.tabbar.scroll.smooth", true);
pref("extensions.treestyletab.tabbar.scroll.timeout", 250);
pref("extensions.treestyletab.tabbar.style", "default");
pref("extensions.treestyletab.tabbar.style", "mixed");
pref("extensions.treestyletab.levelMargin", 12);
pref("extensions.treestyletab.openGroupBookmarkAsTabSubTree", true);

View File

@ -5,7 +5,7 @@
<RDF:Description RDF:about="urn:mozilla:install-manifest"
em:id="treestyletab@piro.sakura.ne.jp"
em:name="Tree Style Tab"
em:version="0.1.2007102201"
em:version="0.1.2007102202"
em:creator="SHIMODA Hiroshi"
em:description="Show tabs like a tree."
em:homepageURL="http://piro.sakura.ne.jp/xul/treestyletab/"
@ -32,7 +32,7 @@
<em:targetApplication>
<RDF:Description em:id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
em:minVersion="2.0"
em:maxVersion="2.0.0.*" />
em:maxVersion="3.0a9" />
</em:targetApplication>
</RDF:Description>
</RDF:RDF>

View File

@ -10,7 +10,7 @@
<!ENTITY config.tabbar.position.right "Rightside">
<!ENTITY config.tabbar.style.caption "Appearance of the tab bar">
<!ENTITY config.tabbar.style.default "Default">
<!ENTITY config.tabbar.style.default "Plain">
<!ENTITY config.tabbar.style.vertigo "Vertigo">
<!ENTITY config.tabbar.style.mixed "Mixed">

View File

@ -10,7 +10,7 @@
<!ENTITY config.tabbar.position.right "ウィンドウの右側">
<!ENTITY config.tabbar.style.caption "タブバーの表示スタイル">
<!ENTITY config.tabbar.style.default "標準">
<!ENTITY config.tabbar.style.default "プレーン">
<!ENTITY config.tabbar.style.vertigo "Vertigo">
<!ENTITY config.tabbar.style.mixed "Mixed">

View File

@ -47,7 +47,9 @@ tabbrowser[treestyletab-vertical="true"] .tabbrowser-tab > .tab-image-right {
tabbrowser[treestyletab-vertical="true"] .tabbrowser-tab > .tab-image-middle,
tabbrowser[treestyletab-vertical="true"] .tabbrowser-tab > .tab-close-button {
tabbrowser[treestyletab-vertical="true"] .tabbrowser-tab:not([selected="true"]):not(:hover) > .tab-image-middle,
tabbrowser[treestyletab-vertical="true"] .tabbrowser-tab > .tab-close-button,
tabbrowser[treestyletab-vertical="true"] .tabbrowser-tab:not([selected="true"]):not(:hover) > .tab-image-middle > .tab-close-button {
height: auto;
margin: 0 !important;
padding: 0 !important;