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

無駄なコードを削除

Browse Source 
git-svn-id: http://www.cozmixng.org/repos/piro/treestyletab/trunk@5000 599a83e7-65a4-db11-8015-0010dcdd6dc2
This commit is contained in:
piro 2009-08-25 10:10:29 +00:00
parent ef9fcb7755
commit 80b1224c46
7 changed files with 15 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
chrome.manifest
View File

@ -14,7 +14,7 @@ overlay chrome://multipletab/content/config.xul chrome://treestyletab/content/mu
overlay chrome://browser/content/browser.xul chrome://treestyletab/content/res/bookmarkMultipleTabs.xul overlay chrome://browser/content/browser.xul chrome://treestyletab/content/res/bookmarkMultipleTabs.xul
overlay chrome://browser/content/places/bookmarkProperties2.xul chrome://treestyletab/content/res/bookmarkMultipleTabs_bookmarkPropertiesOverlay.xul overlay chrome://browser/content/places/bookmarkProperties2.xul chrome://treestyletab/content/res/bookmarkMultipleTabs_bookmarkPropertiesOverlay.xul
style chrome://browser/content/browser.xul chrome://treestyletab/content/treestyletab-3.5.css appversion>=3.1 style chrome://browser/content/browser.xul chrome://treestyletab/content/treestyletab-3.5.css appversion>=3.5
locale treestyletab en-US jar:chrome/treestyletab.jar!/locale/en-US/treestyletab/ locale treestyletab en-US jar:chrome/treestyletab.jar!/locale/en-US/treestyletab/
locale treestyletab ja jar:chrome/treestyletab.jar!/locale/ja/treestyletab/ locale treestyletab ja jar:chrome/treestyletab.jar!/locale/ja/treestyletab/
@ -32,7 +32,7 @@ override chrome://treestyletab/skin/group-icon chrome://treestyletab/skin/group-
override chrome://treestyletab/skin/group-icon chrome://treestyletab/skin/group-fx3-aero.png os=WINNT osversion>=6 override chrome://treestyletab/skin/group-icon chrome://treestyletab/skin/group-fx3-aero.png os=WINNT osversion>=6
override chrome://treestyletab/skin/square/compat.css chrome://treestyletab/skin/dummy.css override chrome://treestyletab/skin/square/compat.css chrome://treestyletab/skin/dummy.css
override chrome://treestyletab/skin/square/compat.css chrome://treestyletab/skin/square/compat-3.5.css appversion>=3.1 override chrome://treestyletab/skin/square/compat.css chrome://treestyletab/skin/square/compat-3.5.css appversion>=3.5
override chrome://treestyletab/skin/metal/tab.css chrome://treestyletab/skin/metal/tab-3.5.css appversion>=3.1 override chrome://treestyletab/skin/metal/tab.css chrome://treestyletab/skin/metal/tab-3.5.css appversion>=3.5
override chrome://treestyletab/skin/config.css chrome://treestyletab/skin/config-3.7.png appversion>=3.7a1pre override chrome://treestyletab/skin/config.css chrome://treestyletab/skin/config-3.7.png appversion>=3.7a1pre

2
content/treestyletab/config.js
View File

@ -154,7 +154,7 @@ function onChangeTabbarPosition(aOnChange)
var hideAllTabsCheckH = document.getElementById('extensions.treestyletab.tabbar.hideAlltabsButton.horizontal-check'); var hideAllTabsCheckH = document.getElementById('extensions.treestyletab.tabbar.hideAlltabsButton.horizontal-check');
var hideAllTabsCheckV = document.getElementById('extensions.treestyletab.tabbar.hideAlltabsButton.vertical-check'); var hideAllTabsCheckV = document.getElementById('extensions.treestyletab.tabbar.hideAlltabsButton.vertical-check');
var newTabAvailable = comparator.compare(XULAppInfo.version, '3.1b3') >= 0; var newTabAvailable = comparator.compare(XULAppInfo.version, '3.5') >= 0;
if (!newTabAvailable) { if (!newTabAvailable) {
hideNewTabCheckH.setAttribute('collapsed', true); hideNewTabCheckH.setAttribute('collapsed', true);
hideNewTabCheckV.setAttribute('collapsed', true); hideNewTabCheckV.setAttribute('collapsed', true);

4
content/treestyletab/treestyletab.css
View File

@ -31,7 +31,7 @@ tabbrowser[treestyletab-mode="vertical"] .tabbrowser-arrowscrollbox > .scrollbut
tabbrowser[treestyletab-mode="vertical"] .tabbrowser-arrowscrollbox > .scrollbutton-down-stack, tabbrowser[treestyletab-mode="vertical"] .tabbrowser-arrowscrollbox > .scrollbutton-down-stack,
tabbrowser[treestyletab-mode="vertical"] .tabbrowser-arrowscrollbox > .scrollbutton-down, /* Firefox 3 */ tabbrowser[treestyletab-mode="vertical"] .tabbrowser-arrowscrollbox > .scrollbutton-down, /* Firefox 3 */
tabbrowser[treestyletab-hide-alltabs-button="true"] .tabs-alltabs-stack, tabbrowser[treestyletab-hide-alltabs-button="true"] .tabs-alltabs-stack,
tabbrowser[treestyletab-hide-alltabs-button="true"] .tabbrowser-arrowscrollbox ~ stack, /* "all tabs" button in Firefox 3 and 3.1 */ tabbrowser[treestyletab-hide-alltabs-button="true"] .tabbrowser-arrowscrollbox ~ stack, /* "all tabs" button in Firefox 3 and 3.5 */
tabbrowser[treestyletab-mode="vertical"] .tabs-closebutton-box, tabbrowser[treestyletab-mode="vertical"] .tabs-closebutton-box,
tabbrowser[treestyletab-mode="vertical"] .tab-drop-indicator-bar, tabbrowser[treestyletab-mode="vertical"] .tab-drop-indicator-bar,
tabbrowser[treestyletab-mode="vertical"] #vide-bar, /* Tab Mix Plus */ tabbrowser[treestyletab-mode="vertical"] #vide-bar, /* Tab Mix Plus */
@ -52,7 +52,7 @@ tabbrowser[treestyletab-mode="vertical"] tabs[flowing] > * .tabs-frame /* Tab Mi
overflow-y: auto !important; overflow-y: auto !important;
} }
tabbrowser[treestyletab-mode="vertical"] .tabs-stack > *:first-child + * > hbox, /* Firefox 3.0 (not 3.1) */ tabbrowser[treestyletab-mode="vertical"] .tabs-stack > *:first-child + * > hbox, /* Firefox 3.0 (not 3.5) */
tabbrowser[treestyletab-mode="vertical"] tabs[flowing] > * .tabs-frame /* Tab Mix Plus */ { tabbrowser[treestyletab-mode="vertical"] tabs[flowing] > * .tabs-frame /* Tab Mix Plus */ {
-moz-box-flex: 1 !important; -moz-box-flex: 1 !important;
} }

33
content/treestyletab/treestyletab.js
View File

@ -1408,7 +1408,7 @@ var TreeStyleTabService = {
updateTabDNDObserver : function(aObserver) updateTabDNDObserver : function(aObserver)
{ {
if ('_onDragStart' in aObserver) { // Firefox 3.1 or later if ('_onDragStart' in aObserver) { // Firefox 3.5 or later
eval('aObserver._onDragStart = '+ eval('aObserver._onDragStart = '+
aObserver._onDragStart.toSource().replace( aObserver._onDragStart.toSource().replace(
'if (target.localName == "tab"', 'if (target.localName == "tab"',
@ -1441,7 +1441,7 @@ var TreeStyleTabService = {
} }
var canDropFunctionName = '_setEffectAllowedForDataTransfer' in aObserver ? var canDropFunctionName = '_setEffectAllowedForDataTransfer' in aObserver ?
'_setEffectAllowedForDataTransfer' : // Firefox 3.1 or later '_setEffectAllowedForDataTransfer' : // Firefox 3.5 or later
'canDrop' ; // Firefox 3.0.x 'canDrop' ; // Firefox 3.0.x
eval('aObserver.'+canDropFunctionName+' = '+ eval('aObserver.'+canDropFunctionName+' = '+
aObserver[canDropFunctionName].toSource().replace( aObserver[canDropFunctionName].toSource().replace(
@ -1499,7 +1499,7 @@ catch(e) {
); );
var dragOverFunctionName = '_onDragOver' in aObserver ? var dragOverFunctionName = '_onDragOver' in aObserver ?
'_onDragOver' : // Firefox 3.1 or later '_onDragOver' : // Firefox 3.5 or later
'onDragOver' ; // Firefox 3.0.x 'onDragOver' ; // Firefox 3.0.x
eval('aObserver.'+dragOverFunctionName+' = '+ eval('aObserver.'+dragOverFunctionName+' = '+
aObserver[dragOverFunctionName].toSource().replace( aObserver[dragOverFunctionName].toSource().replace(
@ -1554,7 +1554,7 @@ catch(e) {
); );
var dragExitFunctionName = '_onDragLeave' in aObserver ? var dragExitFunctionName = '_onDragLeave' in aObserver ?
'_onDragLeave' : // Firefox 3.1 or later '_onDragLeave' : // Firefox 3.5 or later
'onDragExit' ; // Firefox 3.0.x 'onDragExit' ; // Firefox 3.0.x
eval('aObserver.'+dragExitFunctionName+' = '+ eval('aObserver.'+dragExitFunctionName+' = '+
aObserver[dragExitFunctionName].toSource().replace( aObserver[dragExitFunctionName].toSource().replace(
@ -1564,7 +1564,7 @@ catch(e) {
); );
var dropFunctionName = '_onDrop' in aObserver ? var dropFunctionName = '_onDrop' in aObserver ?
'_onDrop' : // Firefox 3.1 or later '_onDrop' : // Firefox 3.5 or later
'onDrop' ; // Firefox 3.0.x 'onDrop' ; // Firefox 3.0.x
eval('aObserver.'+dropFunctionName+' = '+ eval('aObserver.'+dropFunctionName+' = '+
aObserver[dropFunctionName].toSource().replace( aObserver[dropFunctionName].toSource().replace(
@ -1575,7 +1575,7 @@ catch(e) {
TSTTabBrowser.treeStyleTab.clearDropPosition(); TSTTabBrowser.treeStyleTab.clearDropPosition();
var dropActionInfo = TSTTabBrowser.treeStyleTab.getDropAction(aEvent, TST_DRAGSESSION); var dropActionInfo = TSTTabBrowser.treeStyleTab.getDropAction(aEvent, TST_DRAGSESSION);
]]> ]]>
).replace( // Firefox 3.0.x, 3.1 or later ).replace( // Firefox 3.0.x, 3.5 or later
/(if \((accelKeyPressed|isCopy|dropEffect == "copy")\) {)/, /(if \((accelKeyPressed|isCopy|dropEffect == "copy")\) {)/,
<![CDATA[ <![CDATA[
if (TSTTabBrowser.treeStyleTab.performDrop(dropActionInfo, draggedTab)) if (TSTTabBrowser.treeStyleTab.performDrop(dropActionInfo, draggedTab))
@ -1896,32 +1896,13 @@ catch(e) {
contentAreaDNDObserver.onDrop.toSource().replace( contentAreaDNDObserver.onDrop.toSource().replace(
'var types = aEvent.dataTransfer.types;', 'var types = aEvent.dataTransfer.types;',
<![CDATA[$& <![CDATA[$&
if (types.contains(gBrowser.treeStyleTab.kDRAG_TYPE_TABBAR)) { if (gBrowser.treeStyleTab.panelDNDObserver.canDrop(aEvent, aDragSession)) {
return gBrowser.treeStyleTab.panelDNDObserver.onDrop(aEvent); return gBrowser.treeStyleTab.panelDNDObserver.onDrop(aEvent);
} }
]]> ]]>
) )
); );
} }
else { // Firefox 3.0.x
eval('contentAreaDNDObserver.onDrop = '+
contentAreaDNDObserver.onDrop.toSource().replace(
'{',
<![CDATA[$&
if (gBrowser.treeStyleTab.panelDNDObserver.canDrop(aEvent, aDragSession)) {
aEvent.preventDefault();
return gBrowser.treeStyleTab.panelDNDObserver.onDrop(aEvent, aXferData, aDragSession);
}
]]>
)
);
eval('contentAreaDNDObserver.getSupportedFlavours = '+
contentAreaDNDObserver.getSupportedFlavours.toSource().replace(
'flavourSet.appendFlavour(',
'flavourSet.appendFlavour(TreeStyleTabService.kDRAG_TYPE_TABBAR); $&'
)
);
}
}, },
_splitFunctionNames : function(aString) _splitFunctionNames : function(aString)
{ {

1
content/treestyletab/treestyletabbrowser.js
View File

@ -2473,7 +2473,6 @@ TreeStyleTabBrowser.prototype = {
onDrop : function(aEvent, aXferData, aDragSession) onDrop : function(aEvent, aXferData, aDragSession)
{ {
if (!this.canDrop(aEvent, aDragSession)) return;
var sv = this.mOwner; var sv = this.mOwner;
var position = this.getDropPosition(aEvent); var position = this.getDropPosition(aEvent);
if (position != sv.mTabBrowser.getAttribute(sv.kTABBAR_POSITION)) if (position != sv.mTabBrowser.getAttribute(sv.kTABBAR_POSITION))

2
platform/Darwin/chrome.manifest
View File

@ -1,3 +1,3 @@
skin treestyletab-platform classic/1.0 jar:chrome/treestyletab.jar!/skin/classic/treestyletab/ skin treestyletab-platform classic/1.0 jar:chrome/treestyletab.jar!/skin/classic/treestyletab/
style chrome://browser/content/browser.xul chrome://treestyletab-platform/skin/treestyletab-3.5.css appversion>=3.1b3pre style chrome://browser/content/browser.xul chrome://treestyletab-platform/skin/treestyletab-3.5.css appversion>=3.5

2
platform/Linux/chrome.manifest
View File

@ -1,3 +1,3 @@
skin treestyletab-platform classic/1.0 jar:chrome/treestyletab.jar!/skin/classic/treestyletab/ skin treestyletab-platform classic/1.0 jar:chrome/treestyletab.jar!/skin/classic/treestyletab/
style chrome://browser/content/browser.xul chrome://treestyletab-platform/skin/treestyletab-3.5.css appversion>=3.1b3pre style chrome://browser/content/browser.xul chrome://treestyletab-platform/skin/treestyletab-3.5.css appversion>=3.5