Bug 197671 Separate "When Navigator starts up" from "What a new tab/window does" preferences

patch by ian@arlen.demon.co.uk r=timeless sr=jag


git-svn-id: svn://10.0.0.236/trunk@211348 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
timeless%mozdev.org 2006-09-14 06:07:24 +00:00
parent d8bb341aa2
commit ea258790b6

View File

@ -1028,11 +1028,30 @@ function BrowserOpenWindow()
function BrowserOpenTab()
{
if (!gInPrintPreviewMode) {
var handler = Components.classes['@mozilla.org/commandlinehandler/general-startup;1?type=browser']
.getService(Components.interfaces.nsICmdLineHandler);
var uriToLoad = handler.defaultArgs.split("\n")[0];
if (/^\s*$/.test(uriToLoad))
var uriToLoad;
try {
switch ( pref.getIntPref("browser.tabs.loadOnNewTab") )
{
case -1:
var handler = Components.classes['@mozilla.org/commandlinehandler/general-startup;1?type=browser']
.getService(Components.interfaces.nsICmdLineHandler);
uriToLoad = handler.defaultArgs.split("\n")[0];
if (!/\S/.test(uriToLoad))
uriToLoad = "about:blank";
break;
default:
uriToLoad = "about:blank";
break;
case 1:
uriToLoad = pref.getCharPref("browser.startup.homepage");
break;
case 2:
uriToLoad = getWebNavigation().currentURI.spec;
break;
}
} catch(e) {
uriToLoad = "about:blank";
}
gBrowser.selectedTab = gBrowser.addTab(uriToLoad);
var navBar = document.getElementById("nav-bar");