Bug 1412507 - Port
bug 1411532 (part 2) to TB: Add a line to about:support that says whether stylo is enabled for chrome. r=aceman CLOSED TREE DONTBUILD
--- a/mail/components/about-support/content/aboutSupport.js
+++ b/mail/components/about-support/content/aboutSupport.js
@@ -98,31 +98,37 @@ var snapshotFormatters = {
if (data.remoteAutoStart) {
$("contentprocesses-box").textContent = data.currentContentProcesses +
"/" +
data.maxContentProcesses;
} else {
$("contentprocesses-row").hidden = true;
}
+ function getReasonStringName(resultValue, defaultValue) {
+ if (resultValue != defaultValue) {
+ return resultValue ? "enabledByUser" : "disabledByUser";
+ }
+ return resultValue ? "enabledByDefault" : "disabledByDefault";
+ }
let styloReason;
+ let styloChromeReason;
if (!data.styloBuild) {
- styloReason = strings.GetStringFromName("disabledByBuild");
- } else if (data.styloResult != data.styloDefault) {
- if (data.styloResult) {
- styloReason = strings.GetStringFromName("enabledByUser");
- } else {
- styloReason = strings.GetStringFromName("disabledByUser");
- }
- } else if (data.styloDefault) {
- styloReason = strings.GetStringFromName("enabledByDefault");
+ styloReason = "disabledByBuild";
+ styloChromeReason = "disabledByBuild";
} else {
- styloReason = strings.GetStringFromName("disabledByDefault");
+ styloReason = getReasonStringName(data.styloResult, data.styloDefault);
+ styloChromeReason = getReasonStringName(data.styloChromeResult,
+ data.styloChromeDefault);
}
- $("stylo-box").textContent = `${data.styloResult} (${styloReason})`;
+ styloReason = strings.GetStringFromName(styloReason);
+ styloChromeReason = strings.GetStringFromName(styloChromeReason);
+ $("stylo-box").textContent =
+ `content = ${data.styloResult} (${styloReason}), ` +
+ `chrome = ${data.styloChromeResult} (${styloChromeReason})`;
let keyGoogleFound = data.keyGoogleFound ? "found" : "missing";
$("key-google-box").textContent = strings.GetStringFromName(keyGoogleFound);
let keyMozillaFound = data.keyMozillaFound ? "found" : "missing";
$("key-mozilla-box").textContent = strings.GetStringFromName(keyMozillaFound);
$("safemode-box").textContent = data.safeMode;