зеркало из https://github.com/mozilla/gecko-dev.git
Backed out changeset fd06c4854aba (bug 1545736) for bc failures at browser_policy_disable_safemode.js. CLOSED TREE
This commit is contained in:
Родитель
f6228d736f
Коммит
dd528e580c
|
@ -17,7 +17,7 @@ XPCOMUtils.defineLazyServiceGetter(
|
||||||
async function flush() {
|
async function flush() {
|
||||||
try {
|
try {
|
||||||
ProfileService.flush();
|
ProfileService.flush();
|
||||||
rebuildProfileList();
|
refreshUI();
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
let [title, msg, button] = await document.l10n.formatValues([
|
let [title, msg, button] = await document.l10n.formatValues([
|
||||||
{ id: "profiles-flush-fail-title" },
|
{ id: "profiles-flush-fail-title" },
|
||||||
|
@ -38,7 +38,7 @@ async function flush() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function rebuildProfileList() {
|
function refreshUI() {
|
||||||
let parent = document.getElementById("profiles");
|
let parent = document.getElementById("profiles");
|
||||||
while (parent.firstChild) {
|
while (parent.firstChild) {
|
||||||
parent.firstChild.remove();
|
parent.firstChild.remove();
|
||||||
|
@ -72,6 +72,19 @@ function rebuildProfileList() {
|
||||||
isInUse,
|
isInUse,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let createButton = document.getElementById("create-button");
|
||||||
|
createButton.onclick = createProfileWizard;
|
||||||
|
|
||||||
|
let restartSafeModeButton = document.getElementById("restart-in-safe-mode-button");
|
||||||
|
if (!Services.policies || Services.policies.isAllowed("safeMode")) {
|
||||||
|
restartSafeModeButton.onclick = function() { restart(true); };
|
||||||
|
} else {
|
||||||
|
restartSafeModeButton.setAttribute("disabled", "true");
|
||||||
|
}
|
||||||
|
|
||||||
|
let restartNormalModeButton = document.getElementById("restart-button");
|
||||||
|
restartNormalModeButton.onclick = function() { restart(false); };
|
||||||
}
|
}
|
||||||
|
|
||||||
function display(profileData) {
|
function display(profileData) {
|
||||||
|
@ -339,23 +352,10 @@ function restart(safeMode) {
|
||||||
}
|
}
|
||||||
|
|
||||||
window.addEventListener("DOMContentLoaded", function() {
|
window.addEventListener("DOMContentLoaded", function() {
|
||||||
let createButton = document.getElementById("create-button");
|
|
||||||
createButton.addEventListener("click", createProfileWizard);
|
|
||||||
|
|
||||||
let restartSafeModeButton = document.getElementById("restart-in-safe-mode-button");
|
|
||||||
if (!Services.policies || Services.policies.isAllowed("safeMode")) {
|
|
||||||
restartSafeModeButton.addEventListener("click", () => { restart(true); });
|
|
||||||
} else {
|
|
||||||
restartSafeModeButton.setAttribute("disabled", "true");
|
|
||||||
}
|
|
||||||
|
|
||||||
let restartNormalModeButton = document.getElementById("restart-button");
|
|
||||||
restartNormalModeButton.addEventListener("click", () => { restart(false); });
|
|
||||||
|
|
||||||
if (ProfileService.isListOutdated) {
|
if (ProfileService.isListOutdated) {
|
||||||
document.getElementById("owned").hidden = true;
|
document.getElementById("owned").hidden = true;
|
||||||
} else {
|
} else {
|
||||||
document.getElementById("conflict").hidden = true;
|
document.getElementById("conflict").hidden = true;
|
||||||
rebuildProfileList()();
|
refreshUI();
|
||||||
}
|
}
|
||||||
}, {once: true});
|
}, {once: true});
|
||||||
|
|
Загрузка…
Ссылка в новой задаче