mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-11 04:15:43 +00:00
Bug 386746: remove unneeded URL bar code, patch by Dão Gottwald <dao@design-noir.de>, r=me
This commit is contained in:
parent
74f7aa6e2c
commit
f8eb26511d
@ -101,7 +101,6 @@ var gNavigatorBundle = null;
|
||||
var gIsLoadingBlank = false;
|
||||
var gLastValidURLStr = "";
|
||||
var gLastValidURL = null;
|
||||
var gClickSelectsAll = false;
|
||||
var gMustLoadSidebar = false;
|
||||
var gProgressMeterPanel = null;
|
||||
var gProgressCollapseTimer = null;
|
||||
@ -117,7 +116,6 @@ var gChromeState = null; // chrome state before we went into print preview
|
||||
|
||||
var gSanitizeListener = null;
|
||||
|
||||
var gURLBarAutoFillPrefListener = null;
|
||||
var gAutoHideTabbarPrefListener = null;
|
||||
var gBookmarkAllTabsHandler = null;
|
||||
|
||||
@ -1076,11 +1074,6 @@ function delayedStartup()
|
||||
// Set up Sanitize Item
|
||||
gSanitizeListener = new SanitizeListener();
|
||||
|
||||
// Enable/Disable URL Bar Auto Fill
|
||||
gURLBarAutoFillPrefListener = new URLBarAutoFillPrefListener();
|
||||
gPrefService.addObserver(gURLBarAutoFillPrefListener.domain,
|
||||
gURLBarAutoFillPrefListener, false);
|
||||
|
||||
// Enable/Disable auto-hide tabbar
|
||||
gAutoHideTabbarPrefListener = new AutoHideTabbarPrefListener();
|
||||
gPrefService.addObserver(gAutoHideTabbarPrefListener.domain,
|
||||
@ -1089,10 +1082,6 @@ function delayedStartup()
|
||||
gPrefService.addObserver(gHomeButton.prefDomain, gHomeButton, false);
|
||||
gHomeButton.updateTooltip();
|
||||
|
||||
gClickSelectsAll = gPrefService.getBoolPref("browser.urlbar.clickSelectsAll");
|
||||
if (gURLBar)
|
||||
gURLBar.clickSelectsAll = gClickSelectsAll;
|
||||
|
||||
#ifdef HAVE_SHELL_SERVICE
|
||||
// Perform default browser checking (after window opens).
|
||||
var shell = getShellService();
|
||||
@ -1221,8 +1210,6 @@ function BrowserShutdown()
|
||||
#endif
|
||||
|
||||
try {
|
||||
gPrefService.removeObserver(gURLBarAutoFillPrefListener.domain,
|
||||
gURLBarAutoFillPrefListener);
|
||||
gPrefService.removeObserver(gAutoHideTabbarPrefListener.domain,
|
||||
gAutoHideTabbarPrefListener);
|
||||
gPrefService.removeObserver(gHomeButton.prefDomain, gHomeButton);
|
||||
@ -1328,41 +1315,6 @@ function nonBrowserWindowDelayedStartup()
|
||||
}
|
||||
#endif
|
||||
|
||||
function URLBarAutoFillPrefListener()
|
||||
{
|
||||
this.toggleAutoFillInURLBar();
|
||||
}
|
||||
|
||||
URLBarAutoFillPrefListener.prototype =
|
||||
{
|
||||
domain: "browser.urlbar.autoFill",
|
||||
observe: function (aSubject, aTopic, aPrefName)
|
||||
{
|
||||
if (aTopic != "nsPref:changed" || aPrefName != this.domain)
|
||||
return;
|
||||
|
||||
this.toggleAutoFillInURLBar();
|
||||
},
|
||||
|
||||
toggleAutoFillInURLBar: function ()
|
||||
{
|
||||
if (!gURLBar)
|
||||
return;
|
||||
|
||||
var prefValue = false;
|
||||
try {
|
||||
prefValue = gPrefService.getBoolPref(this.domain);
|
||||
}
|
||||
catch (e) {
|
||||
}
|
||||
|
||||
if (prefValue)
|
||||
gURLBar.setAttribute("completedefaultindex", "true");
|
||||
else
|
||||
gURLBar.removeAttribute("completedefaultindex");
|
||||
}
|
||||
}
|
||||
|
||||
function AutoHideTabbarPrefListener()
|
||||
{
|
||||
this.toggleAutoHideTabbar();
|
||||
@ -3357,8 +3309,6 @@ function BrowserToolboxCustomizeDone(aToolboxChanged)
|
||||
// Update global UI elements that may have been added or removed
|
||||
if (aToolboxChanged) {
|
||||
gURLBar = document.getElementById("urlbar");
|
||||
if (gURLBar)
|
||||
gURLBar.clickSelectsAll = gClickSelectsAll;
|
||||
gProxyButton = document.getElementById("page-proxy-button");
|
||||
gProxyFavIcon = document.getElementById("page-proxy-favicon");
|
||||
gProxyDeck = document.getElementById("page-proxy-deck");
|
||||
|
@ -103,6 +103,8 @@
|
||||
this._prefs.addObserver("", this, false);
|
||||
this._hideProtocols = this._prefs.getCharPref("hideProtocols").split(" ");
|
||||
this._animateBlend = this._prefs.getBoolPref("animateBlend");
|
||||
this.clickSelectsAll = this._prefs.getBoolPref("clickSelectsAll");
|
||||
this.completeDefaultIndex = this._prefs.getBoolPref("autoFill");
|
||||
|
||||
this._inputBox = document.getAnonymousElementByAttribute(this, "anonid", "textbox-input-box");
|
||||
this._presentationBox = document.getAnonymousElementByAttribute(this, "anonid", "presentation-box");
|
||||
@ -134,9 +136,17 @@
|
||||
this.inputField.controllers.removeController(this._copyCutController);
|
||||
]]></destructor>
|
||||
|
||||
<!-- initially empty fields:
|
||||
<field name="_uri"/>
|
||||
<field name="_protocolHidden"/>
|
||||
<field name="_focused"/>
|
||||
<field name="_mouseover"/>
|
||||
<field name="_tooltipTimer"/>
|
||||
<field name="_tldService"/>
|
||||
<field name="_plain"/>
|
||||
-->
|
||||
<field name="_blendingTimers">[]</field>
|
||||
|
||||
<field name="_plain">true</field>
|
||||
<property name="plain" onget="return this._plain">
|
||||
<setter><![CDATA[
|
||||
this._plain = !!val;
|
||||
@ -154,7 +164,6 @@
|
||||
]]></setter>
|
||||
</property>
|
||||
|
||||
<field name="_tldService"/>
|
||||
<property name="tldService" readonly="true">
|
||||
<getter><![CDATA[
|
||||
if (!this._tldService) {
|
||||
@ -432,6 +441,9 @@
|
||||
case "clickSelectsAll":
|
||||
this.clickSelectsAll = this._prefs.getBoolPref(aData);
|
||||
break;
|
||||
case "autoFill":
|
||||
this.completeDefaultIndex = this._prefs.getBoolPref(aData);
|
||||
break;
|
||||
case "animateBlend":
|
||||
this._animateBlend = this._prefs.getBoolPref(aData);
|
||||
break;
|
||||
|
Loading…
Reference in New Issue
Block a user