зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1503551 - Make window.external.AddSearchProvider a dummy function, r=smaug
This commit is contained in:
Родитель
223d7172bf
Коммит
71b39f6750
|
@ -159,6 +159,10 @@ add_task(async function test_opensearch_disabled() {
|
|||
});
|
||||
|
||||
add_task(async function test_AddSearchProvider() {
|
||||
if (!Services.prefs.getBoolPref("dom.sidebar.enabled", false)) {
|
||||
return;
|
||||
}
|
||||
|
||||
// Mock the modal error dialog
|
||||
let mockPrompter = {
|
||||
promptCount: 0,
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
[DEFAULT]
|
||||
prefs = dom.sidebar.enabled=true
|
||||
support-files =
|
||||
426329.xml
|
||||
483086-1.xml
|
||||
|
|
|
@ -8,5 +8,5 @@
|
|||
interface External
|
||||
{
|
||||
void AddSearchProvider(DOMString aDescriptionURL);
|
||||
unsigned long IsSearchProviderInstalled(DOMString aSearchURL);
|
||||
void IsSearchProviderInstalled();
|
||||
};
|
||||
|
|
|
@ -5956,3 +5956,9 @@ pref("dom.datatransfer.mozAtAPIs", true);
|
|||
#ifdef MOZ_LIBPRIO
|
||||
pref("prio.enabled", false);
|
||||
#endif
|
||||
|
||||
#ifdef NIGHTLY_BUILD
|
||||
pref("dom.sidebar.enabled", false);
|
||||
#else
|
||||
pref("dom.sidebar.enabled", true);
|
||||
#endif
|
||||
|
|
|
@ -4,6 +4,7 @@
|
|||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm");
|
||||
ChromeUtils.import("resource://gre/modules/Services.jsm");
|
||||
|
||||
function nsSidebar() {
|
||||
}
|
||||
|
@ -18,6 +19,10 @@ nsSidebar.prototype = {
|
|||
// The capitalization, although nonstandard here, is to match other browsers'
|
||||
// APIs and is therefore important.
|
||||
AddSearchProvider(engineURL) {
|
||||
if (!Services.prefs.getBoolPref("dom.sidebar.enabled", false)) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!this.mm) {
|
||||
Cu.reportError(`Installing a search provider from this context is not currently supported: ${Error().stack}.`);
|
||||
return;
|
||||
|
@ -32,9 +37,7 @@ nsSidebar.prototype = {
|
|||
// This function exists to implement window.external.IsSearchProviderInstalled(),
|
||||
// for compatibility with other browsers. The function has been deprecated
|
||||
// and so will not be implemented.
|
||||
IsSearchProviderInstalled(engineURL) {
|
||||
return 0;
|
||||
},
|
||||
IsSearchProviderInstalled() {},
|
||||
|
||||
classID: Components.ID("{22117140-9c6e-11d3-aaf1-00805f8a4905}"),
|
||||
QueryInterface: ChromeUtils.generateQI([Ci.nsIDOMGlobalPropertyInitializer]),
|
||||
|
|
Загрузка…
Ссылка в новой задаче