From 9433b647c111cb1a00da1a87a99856c33c6eca16 Mon Sep 17 00:00:00 2001 From: Cameron Kaiser Date: Wed, 18 Oct 2017 23:08:29 -0700 Subject: [PATCH] #363: remove Get Add-ons, remove built-in AMO search --- toolkit/mozapps/extensions/content/extensions.css | 1 + toolkit/mozapps/extensions/content/extensions.js | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/toolkit/mozapps/extensions/content/extensions.css b/toolkit/mozapps/extensions/content/extensions.css index 6224540cc..e2d4e6e86 100644 --- a/toolkit/mozapps/extensions/content/extensions.css +++ b/toolkit/mozapps/extensions/content/extensions.css @@ -221,6 +221,7 @@ richlistitem:not([selected]) * { #header-search { width: 22em; + display: none; } #header-utils-btn { diff --git a/toolkit/mozapps/extensions/content/extensions.js b/toolkit/mozapps/extensions/content/extensions.js index 53e978109..10189a3fd 100644 --- a/toolkit/mozapps/extensions/content/extensions.js +++ b/toolkit/mozapps/extensions/content/extensions.js @@ -217,6 +217,8 @@ function isCorrectlySigned(aAddon) { } function isDiscoverEnabled() { +return false; // issue 363 +/* if (Services.prefs.getPrefType(PREF_DISCOVERURL) == Services.prefs.PREF_INVALID) return false; @@ -231,6 +233,7 @@ function isDiscoverEnabled() { } catch (e) {} return true; +*/ } function getExperimentEndDate(aAddon) { @@ -1745,6 +1748,7 @@ var gCategories = { initialize: function() { this.node = document.getElementById("categories"); this._search = this.get("addons://search/"); + this._search.disabled = true; var types = AddonManager.addonTypes; for (var type in types) @@ -1969,6 +1973,7 @@ var gHeader = { initialize: function() { this._search = document.getElementById("header-search"); + this._search.disabled = true; this._search.addEventListener("command", function(aEvent) { var query = aEvent.target.value; @@ -1993,7 +1998,7 @@ var gHeader = { }, focusSearchBox: function() { - this._search.focus(); + //this._search.focus(); }, onKeyPress: function(aEvent) {