forked from mirrors/gecko-dev
e930b89c34
***
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
80 lines
2.3 KiB
JavaScript
80 lines
2.3 KiB
JavaScript
/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
|
|
/* 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/. */
|
|
|
|
const {Services} = ChromeUtils.import("resource://gre/modules/Services.jsm");
|
|
|
|
const appStartup = Services.startup;
|
|
|
|
const {ResetProfile} = ChromeUtils.import("resource://gre/modules/ResetProfile.jsm");
|
|
|
|
var defaultToReset = false;
|
|
|
|
function restartApp() {
|
|
appStartup.quit(appStartup.eForceQuit | appStartup.eRestart);
|
|
}
|
|
|
|
function resetProfile() {
|
|
// Set the reset profile environment variable.
|
|
let env = Cc["@mozilla.org/process/environment;1"]
|
|
.getService(Ci.nsIEnvironment);
|
|
env.set("MOZ_RESET_PROFILE_RESTART", "1");
|
|
}
|
|
|
|
function showResetDialog() {
|
|
// Prompt the user to confirm the reset.
|
|
let retVals = {
|
|
reset: false,
|
|
};
|
|
window.openDialog("chrome://global/content/resetProfile.xul", null,
|
|
"chrome,modal,centerscreen,titlebar,dialog=yes", retVals);
|
|
if (!retVals.reset)
|
|
return;
|
|
resetProfile();
|
|
restartApp();
|
|
}
|
|
|
|
function onDefaultButton() {
|
|
if (defaultToReset) {
|
|
// Restart to reset the profile.
|
|
resetProfile();
|
|
restartApp();
|
|
// Return false to prevent starting into safe mode while restarting.
|
|
return false;
|
|
}
|
|
// Continue in safe mode. No restart needed.
|
|
return true;
|
|
}
|
|
|
|
function onCancel() {
|
|
appStartup.quit(appStartup.eForceQuit);
|
|
}
|
|
|
|
function onExtra1() {
|
|
if (defaultToReset) {
|
|
// Continue in safe mode
|
|
window.close();
|
|
return true;
|
|
}
|
|
// The reset dialog will handle starting the reset process if the user confirms.
|
|
showResetDialog();
|
|
return false;
|
|
}
|
|
|
|
function onLoad() {
|
|
if (appStartup.automaticSafeModeNecessary) {
|
|
document.getElementById("autoSafeMode").hidden = false;
|
|
document.getElementById("safeMode").hidden = true;
|
|
if (ResetProfile.resetSupported()) {
|
|
document.getElementById("resetProfile").hidden = false;
|
|
} else {
|
|
// Hide the reset button is it's not supported.
|
|
document.documentElement.getButton("extra1").hidden = true;
|
|
}
|
|
} else if (!ResetProfile.resetSupported()) {
|
|
// Hide the reset button and text if it's not supported.
|
|
document.documentElement.getButton("extra1").hidden = true;
|
|
document.getElementById("resetProfileInstead").hidden = true;
|
|
}
|
|
}
|