This commit is contained in:
blakeross%telocity.com 2002-09-18 19:42:41 +00:00
Родитель 22d098a717
Коммит 7dbfd68dd8
1 изменённых файлов: 8 добавлений и 10 удалений

Просмотреть файл

@ -52,12 +52,10 @@ var gProxyDeck = null;
var gSearchService = null; var gSearchService = null;
var gNavigatorBundle; var gNavigatorBundle;
var gBrandBundle; var gBrandBundle;
var gNavigatorRegionBundle;
var gBrandRegionBundle;
var gLastValidURLStr = ""; var gLastValidURLStr = "";
var gLastValidURL = null; var gLastValidURL = null;
var gHaveUpdatedToolbarState = false; var gHaveUpdatedToolbarState = false;
var gClickSelectsAll = false; var gClickSelectsAll = true;
var gIgnoreFocus = false; var gIgnoreFocus = false;
var gIgnoreClick = false; var gIgnoreClick = false;
@ -153,8 +151,10 @@ function getHomePage()
} }
// use this if we can't find the pref // use this if we can't find the pref
if (!url && gNavigatorRegionBundle) if (!url) {
url = gNavigatorRegionBundle.getString("homePageDefault"); var navigatorRegionBundle = document.getElementById("bundle_browser_region");
url = navigatorRegionBundle.getString("homePageDefault");
}
return url; return url;
} }
@ -208,8 +208,6 @@ function Startup()
// init globals // init globals
gNavigatorBundle = document.getElementById("bundle_browser"); gNavigatorBundle = document.getElementById("bundle_browser");
gBrandBundle = document.getElementById("bundle_brand"); gBrandBundle = document.getElementById("bundle_brand");
gNavigatorRegionBundle = document.getElementById("bundle_browser_region");
gBrandRegionBundle = document.getElementById("bundle_brand_region");
gBrowser = document.getElementById("content"); gBrowser = document.getElementById("content");
gURLBar = document.getElementById("urlbar"); gURLBar = document.getElementById("urlbar");
@ -248,8 +246,7 @@ function Startup()
// Initialize browser instance.. // Initialize browser instance..
appCore.setWebShellWindow(window); appCore.setWebShellWindow(window);
var contentArea = document.getElementById("content"); gBrowser.addEventListener("load", loadEventHandlers, false);
contentArea.addEventListener("load", loadEventHandlers, false);
// set default character set if provided // set default character set if provided
if ("arguments" in window && window.arguments.length > 1 && window.arguments[1]) { if ("arguments" in window && window.arguments.length > 1 && window.arguments[1]) {
@ -341,7 +338,8 @@ function Startup()
addEventListener("fullscreen", onFullScreen, false); addEventListener("fullscreen", onFullScreen, false);
// does clicking on the urlbar select its contents? // does clicking on the urlbar select its contents?
gClickSelectsAll = pref.getBoolPref("browser.urlbar.clickSelectsAll"); if (navigator.platform.indexOf("Win") == -1)
gClickSelectsAll = false;
// set home button tooltip text // set home button tooltip text
var homeButton = document.getElementById("home-button"); var homeButton = document.getElementById("home-button");