diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js index b320c0ac22b..dff9577423e 100644 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js @@ -182,15 +182,26 @@ pref("browser.startup.homepage", "resource:/browserconfig.properties" pref("browser.cache.disk.capacity", 50000); pref("browser.enable_automatic_image_resizing", true); -pref("browser.urlbar.autoFill", false); -pref("browser.urlbar.matchOnlyTyped", false); -pref("browser.urlbar.hideProtocols", ""); -pref("browser.urlbar.animateBlend", true); pref("browser.chrome.site_icons", true); pref("browser.chrome.favicons", true); pref("browser.formfill.enable", true); pref("browser.warnOnQuit", true); +#ifdef XP_UNIX +pref("browser.urlbar.clickSelectsAll", false); +#else +pref("browser.urlbar.clickSelectsAll", true); +#endif +#ifdef UNIX_BUT_NOT_MAC +pref("browser.urlbar.doubleClickSelectsAll", true); +#else +pref("browser.urlbar.doubleClickSelectsAll", false); +#endif +pref("browser.urlbar.autoFill", false); +pref("browser.urlbar.matchOnlyTyped", false); +pref("browser.urlbar.hideProtocols", ""); +pref("browser.urlbar.animateBlend", true); + pref("browser.download.useDownloadDir", true); pref("browser.download.folderList", 0); pref("browser.download.manager.showAlertOnComplete", true); @@ -408,12 +419,6 @@ pref("security.warn_leaving_secure.show_once", true); pref("security.warn_viewing_mixed.show_once", true); pref("security.warn_submit_insecure.show_once", true); -#ifdef XP_UNIX -pref("browser.urlbar.clickSelectsAll", false); -#else -pref("browser.urlbar.clickSelectsAll", true); -#endif - pref("accessibility.typeaheadfind", false); pref("accessibility.typeaheadfind.timeout", 5000); pref("accessibility.typeaheadfind.linksonly", false); diff --git a/browser/base/content/urlbarBindings.xml b/browser/base/content/urlbarBindings.xml index 3fe1041e5fc..0775e35579e 100644 --- a/browser/base/content/urlbarBindings.xml +++ b/browser/base/content/urlbarBindings.xml @@ -86,7 +86,7 @@ - + @@ -123,6 +125,7 @@ this._ioService = null; this._tldService = null; this.inputField.controllers.removeController(this._copyCutController); + this.inputField.removeEventListener("mousedown", this, false); ]]>