mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-11-10 21:28:04 +02:00
***
Bug 1514594: Part 3a - Change ChromeUtils.import to return an exports object; not pollute global. r=mccr8
This changes the behavior of ChromeUtils.import() to return an exports object,
rather than a module global, in all cases except when `null` is passed as a
second argument, and changes the default behavior not to pollute the global
scope with the module's exports. Thus, the following code written for the old
model:
ChromeUtils.import("resource://gre/modules/Services.jsm");
is approximately the same as the following, in the new model:
var {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
Since the two behaviors are mutually incompatible, this patch will land with a
scripted rewrite to update all existing callers to use the new model rather
than the old.
***
Bug 1514594: Part 3b - Mass rewrite all JS code to use the new ChromeUtils.import API. rs=Gijs
This was done using the followng script:
https://bitbucket.org/kmaglione/m-c-rewrites/src/tip/processors/cu-import-exports.jsm
***
Bug 1514594: Part 3c - Update ESLint plugin for ChromeUtils.import API changes. r=Standard8
Differential Revision: https://phabricator.services.mozilla.com/D16747
***
Bug 1514594: Part 3d - Remove/fix hundreds of duplicate imports from sync tests. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16748
***
Bug 1514594: Part 3e - Remove no-op ChromeUtils.import() calls. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16749
***
Bug 1514594: Part 3f.1 - Cleanup various test corner cases after mass rewrite. r=Gijs
***
Bug 1514594: Part 3f.2 - Cleanup various non-test corner cases after mass rewrite. r=Gijs
Differential Revision: https://phabricator.services.mozilla.com/D16750
--HG--
extra : rebase_source : 359574ee3064c90f33bf36c2ebe3159a24cc8895
extra : histedit_source : b93c8f42808b1599f9122d7842d2c0b3e656a594%2C64a3a4e3359dc889e2ab2b49461bab9e27fc10a7
91 lines
3 KiB
JavaScript
91 lines
3 KiB
JavaScript
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
"use strict";
|
|
|
|
const {AppConstants} = ChromeUtils.import("resource://gre/modules/AppConstants.jsm");
|
|
const {Preferences} = ChromeUtils.import("resource://gre/modules/Preferences.jsm");
|
|
|
|
const ACTIVITY_STREAM_PREF_BRANCH = "browser.newtabpage.activity-stream.";
|
|
|
|
this.Prefs = class Prefs extends Preferences {
|
|
/**
|
|
* Prefs - A wrapper around Preferences that always sets the branch to
|
|
* ACTIVITY_STREAM_PREF_BRANCH
|
|
*/
|
|
constructor(branch = ACTIVITY_STREAM_PREF_BRANCH) {
|
|
super({branch});
|
|
this._branchObservers = new Map();
|
|
}
|
|
|
|
ignoreBranch(listener) {
|
|
const observer = this._branchObservers.get(listener);
|
|
this._prefBranch.removeObserver("", observer);
|
|
this._branchObservers.delete(listener);
|
|
}
|
|
|
|
observeBranch(listener) {
|
|
const observer = (subject, topic, pref) => {
|
|
listener.onPrefChanged(pref, this.get(pref));
|
|
};
|
|
this._prefBranch.addObserver("", observer);
|
|
this._branchObservers.set(listener, observer);
|
|
}
|
|
};
|
|
|
|
this.DefaultPrefs = class DefaultPrefs extends Preferences {
|
|
/**
|
|
* DefaultPrefs - A helper for setting and resetting default prefs for the add-on
|
|
*
|
|
* @param {Map} config A Map with {string} key of the pref name and {object}
|
|
* value with the following pref properties:
|
|
* {string} .title (optional) A description of the pref
|
|
* {bool|string|number} .value The default value for the pref
|
|
* @param {string} branch (optional) The pref branch (defaults to ACTIVITY_STREAM_PREF_BRANCH)
|
|
*/
|
|
constructor(config, branch = ACTIVITY_STREAM_PREF_BRANCH) {
|
|
super({
|
|
branch,
|
|
defaultBranch: true,
|
|
});
|
|
this._config = config;
|
|
}
|
|
|
|
/**
|
|
* init - Set default prefs for all prefs in the config
|
|
*/
|
|
init() {
|
|
// Local developer builds (with the default mozconfig) aren't OFFICIAL
|
|
const IS_UNOFFICIAL_BUILD = !AppConstants.MOZILLA_OFFICIAL;
|
|
|
|
for (const pref of this._config.keys()) {
|
|
try {
|
|
// Avoid replacing existing valid default pref values, e.g., those set
|
|
// via Autoconfig or policy
|
|
if (this.get(pref) !== undefined) {
|
|
continue;
|
|
}
|
|
} catch (ex) {
|
|
// We get NS_ERROR_UNEXPECTED for prefs that have a user value (causing
|
|
// default branch to believe there's a type) but no actual default value
|
|
}
|
|
|
|
const prefConfig = this._config.get(pref);
|
|
let value;
|
|
if (IS_UNOFFICIAL_BUILD && "value_local_dev" in prefConfig) {
|
|
value = prefConfig.value_local_dev;
|
|
} else {
|
|
value = prefConfig.value;
|
|
}
|
|
|
|
try {
|
|
this.set(pref, value);
|
|
} catch (ex) {
|
|
// Potentially the user somehow set an unexpected value type, so we fail
|
|
// to set a default of our expected type
|
|
}
|
|
}
|
|
}
|
|
};
|
|
|
|
const EXPORTED_SYMBOLS = ["DefaultPrefs", "Prefs"];
|