FullerScreen 2.4 ( https://addons.mozilla.org/firefox/addon/4650 ) との競合を解消
git-svn-id: http://www.cozmixng.org/repos/piro/treestyletab/trunk@4186 599a83e7-65a4-db11-8015-0010dcdd6dc2
This commit is contained in:
parent
af63a1f3f4
commit
72d0ae1c1e
@ -92,6 +92,17 @@ TreeStyleTabService.overrideExtensionsPreInit = function() {
|
|||||||
'{ TreeStyleTabService.init();'
|
'{ TreeStyleTabService.init();'
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// FullerScreen
|
||||||
|
if ('FS_onFullerScreen' in window) {
|
||||||
|
'CheckIfFullScreen,FS_onFullerScreen,FS_onMouseMove'.split(',').forEach(function(aFunc) {
|
||||||
|
if (!(aFunc in window)) return;
|
||||||
|
eval('window.'+aFunc+' = '+window[aFunc].toSource().replace(
|
||||||
|
/FS_data.mTabs.(removeAttribute\("moz-collapsed"\)|setAttribute\("moz-collapsed", "true"\));/g,
|
||||||
|
'if (gBrowser.getAttribute(TreeStyleTabService.kTABBAR_POSITION) == "top") { $& }'
|
||||||
|
));
|
||||||
|
}, this);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
TreeStyleTabService.overrideExtensionsOnInitBefore = function() {
|
TreeStyleTabService.overrideExtensionsOnInitBefore = function() {
|
||||||
|
@ -143,16 +143,19 @@ window.addEventListener('DOMContentLoaded', function() {
|
|||||||
},
|
},
|
||||||
getZoomForFrame : function(aFrame)
|
getZoomForFrame : function(aFrame)
|
||||||
{
|
{
|
||||||
const Prefs = Components.classes['@mozilla.org/preferences;1'].getService(Components.interfaces.nsIPrefBranch);;
|
const Prefs = Components
|
||||||
|
.classes['@mozilla.org/preferences;1']
|
||||||
|
.getService(Components.interfaces.nsIPrefBranch);
|
||||||
try {
|
try {
|
||||||
if (Prefs.getBoolPref('browser.zoom.full'))
|
if (Prefs.getBoolPref('browser.zoom.full'))
|
||||||
return aFrame
|
var zoom = aFrame
|
||||||
.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
|
.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
|
||||||
.getInterface(Components.interfaces.nsIWebNavigation)
|
.getInterface(Components.interfaces.nsIWebNavigation)
|
||||||
.QueryInterface(Components.interfaces.nsIDocShell)
|
.QueryInterface(Components.interfaces.nsIDocShell)
|
||||||
.contentViewer
|
.contentViewer
|
||||||
.QueryInterface(Components.interfaces.nsIMarkupDocumentViewer)
|
.QueryInterface(Components.interfaces.nsIMarkupDocumentViewer)
|
||||||
.fullZoom;
|
.fullZoom;
|
||||||
|
return zoom;
|
||||||
}
|
}
|
||||||
catch(e) {
|
catch(e) {
|
||||||
}
|
}
|
||||||
|
@ -1156,9 +1156,6 @@ TreeStyleTabBrowser.prototype = {
|
|||||||
scrollBoxObject.getPosition(x, y);
|
scrollBoxObject.getPosition(x, y);
|
||||||
this.lastScrollX = x.value;
|
this.lastScrollX = x.value;
|
||||||
this.lastScrollY = y.value;
|
this.lastScrollY = y.value;
|
||||||
// var tab = aEvent.originalTarget;
|
|
||||||
// var delta = tab.boxObject.height;
|
|
||||||
// scrollBoxObject.scrollTo(x.value, y.value-delta);
|
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user