rendered paste bodyIndex: browser/base/content/browser.js
===================================================================
RCS file: /cvsroot/mozilla/browser/base/content/browser.js,v
retrieving revision 1.637
diff -u -p -8 -r1.637 browser.js
--- browser/base/content/browser.js 6 Jun 2006 16:28:09 -0000 1.637
+++ browser/base/content/browser.js 11 Jun 2006 00:56:17 -0000
@@ -745,18 +745,17 @@ function BrowserStartup()
var uriToLoad = null;
// Check for window.arguments[0]. If present, use that for uriToLoad.
if ("arguments" in window && window.arguments[0])
uriToLoad = window.arguments[0];
gIsLoadingBlank = uriToLoad == "about:blank";
- if (!gIsLoadingBlank)
- prepareForStartup();
+ prepareForStartup();
#ifdef ENABLE_PAGE_CYCLER
appCore.startPageCycler();
#else
# only load url passed in when we're not page cycling
if (uriToLoad && !gIsLoadingBlank) {
if (window.arguments.length >= 3)
loadURI(uriToLoad, window.arguments[2], window.arguments[3] || null,
@@ -949,19 +948,16 @@ function delayedStartup()
.getService(Components.interfaces.nsIPrefBranch);
BrowserOffline.init();
if (gURLBar && document.documentElement.getAttribute("chromehidden").indexOf("toolbar") != -1) {
gURLBar.setAttribute("readonly", "true");
gURLBar.setAttribute("enablehistory", "false");
}
- if (gIsLoadingBlank)
- prepareForStartup();
-
if (gURLBar)
gURLBar.addEventListener("dragdrop", URLBarOnDrop, true);
gBrowser.addEventListener("pageshow", function(evt) { setTimeout(pageShowEventHandlers, 0, evt); }, true);
window.addEventListener("keypress", ctrlNumberTabSelection, false);
if (gMustLoadSidebar) {