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

Minefield 3.1b2preで動作しなくなっていたのを修正

Browse Source 
git-svn-id: http://www.cozmixng.org/repos/piro/treestyletab/trunk@3337 599a83e7-65a4-db11-8015-0010dcdd6dc2
This commit is contained in:
piro 2008-11-14 08:10:33 +00:00
parent fe27c4687f
commit 47af624231
2 changed files with 54 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
content/treestyletab/treestyletab.js
View File

@ -1196,51 +1196,54 @@ catch(e) {
funcs = 'handleLinkClick __splitbrowser__handleLinkClick __ctxextensions__handleLinkClick __treestyletab__highlander__origHandleLinkClick'.split(' ');
for (var i in funcs)
{
if (funcs[i] in window && /^function handleLinkClick/.test(window[funcs[i]].toString()))
eval('window.'+funcs[i]+' = '+
window[funcs[i]].toSource().replace(
/(openNewTabWith\()/g,
<><![CDATA[
if (!TreeStyleTabService.checkToOpenChildTab(event.target.ownerDocument.defaultView)) TreeStyleTabService.readyToOpenChildTab(event.target.ownerDocument.defaultView);
$1]]></>
).replace(
/(event.ctrlKey|event.metaKey)/,
<><![CDATA[
TreeStyleTabService.checkReadyToOpenNewTab({
uri : href,
external : {
newTab : TreeStyleTabService.getTreePref('openOuterLinkInNewTab') || TreeStyleTabService.getTreePref('openAnyLinkInNewTab'),
forceChild : true
},
internal : {
newTab : TreeStyleTabService.getTreePref('openAnyLinkInNewTab')
},
modifier : $1,
invert : TreeStyleTabService.getTreePref('link.invertDefaultBehavior')
}) ? true : (TreeStyleTabService.readyToOpenChildTab(), false)
]]></>
).replace(
'return false;case 1:',
<><![CDATA[
if (!('TMP_contentAreaClick' in window) && // do nothing for Tab Mix Plus
TreeStyleTabService.checkToOpenChildTab()) {
TreeStyleTabService.stopToOpenChildTab();
if (linkNode)
urlSecurityCheck(href,
'nodePrincipal' in linkNode.ownerDocument ?
linkNode.ownerDocument.nodePrincipal :
linkNode.ownerDocument.location.href
);
var postData = {};
href = getShortcutOrURI(href, postData);
if (!href) return false;
loadURI(href, null, postData.value, false);
}
return false;
case 1:
]]></>
)
);
if (!(funcs[i] in window) ||
!/^function handleLinkClick/.test(window[funcs[i]].toString()))
continue;
eval('window.'+funcs[i]+' = '+
window[funcs[i]].toSource().replace(
/(openNewTabWith\()/g,
<><![CDATA[
if (!TreeStyleTabService.checkToOpenChildTab(event.target.ownerDocument.defaultView)) TreeStyleTabService.readyToOpenChildTab(event.target.ownerDocument.defaultView);
$1]]></>
).replace(
/(event.ctrlKey|event.metaKey)/,
<><![CDATA[
TreeStyleTabService.checkReadyToOpenNewTab({
uri : href,
external : {
newTab : TreeStyleTabService.getTreePref('openOuterLinkInNewTab') || TreeStyleTabService.getTreePref('openAnyLinkInNewTab'),
forceChild : true
},
internal : {
newTab : TreeStyleTabService.getTreePref('openAnyLinkInNewTab')
},
modifier : $1,
invert : TreeStyleTabService.getTreePref('link.invertDefaultBehavior')
}) ? true : (TreeStyleTabService.readyToOpenChildTab(), false)
]]></>
).replace(
'return false;case 1:',
<><![CDATA[
if (!('TMP_contentAreaClick' in window) && // do nothing for Tab Mix Plus
TreeStyleTabService.checkToOpenChildTab()) {
TreeStyleTabService.stopToOpenChildTab();
if (linkNode)
urlSecurityCheck(href,
'nodePrincipal' in linkNode.ownerDocument ?
linkNode.ownerDocument.nodePrincipal :
linkNode.ownerDocument.location.href
);
var postData = {};
href = getShortcutOrURI(href, postData);
if (!href) return false;
loadURI(href, null, postData.value, false);
}
return false;
case 1:
]]></>
)
);
break;
}
funcs = 'contentAreaClick __contentAreaClick __ctxextensions__contentAreaClick'.split(' ');

8
content/treestyletab/treestyletabbrowser.js
View File

@ -457,7 +457,9 @@ TreeStyleTabBrowser.prototype = {
}, 0, this);
var allTabPopup = document.getAnonymousElementByAttribute(b.mTabContainer, 'anonid', 'alltabs-popup');
allTabPopup.addEventListener('popupshowing', this, false);
if (allTabPopup) {
allTabPopup.addEventListener('popupshowing', this, false);
}
/* To move up content area on the tab bar, switch tab.
If we don't do it, a gray space appears on the content area
@ -827,7 +829,9 @@ TreeStyleTabBrowser.prototype = {
tabContext.removeEventListener('popuphiding', this, false);
var allTabPopup = document.getAnonymousElementByAttribute(b.mTabContainer, 'anonid', 'alltabs-popup');
allTabPopup.removeEventListener('popupshowing', this, false);
if (allTabPopup) {
allTabPopup.removeEventListener('popupshowing', this, false);
}
if (this.tabbarCanvas) {
this.tabbarCanvas.parentNode.removeChild(this.tabbarCanvas);