зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1719939 - remove browser.proton.enabled from network error page code, r=jaws
Depends on D134308 Differential Revision: https://phabricator.services.mozilla.com/D134309
This commit is contained in:
Родитель
2de5fc98a6
Коммит
4c41898a5b
|
@ -261,22 +261,6 @@ function initPage() {
|
|||
}
|
||||
|
||||
var err = gErrorCode;
|
||||
// List of error pages with an illustration.
|
||||
let illustratedErrors = [
|
||||
"malformedURI",
|
||||
"dnsNotFound",
|
||||
"connectionFailure",
|
||||
"netInterrupt",
|
||||
"netTimeout",
|
||||
"netReset",
|
||||
"netOffline",
|
||||
];
|
||||
if (
|
||||
illustratedErrors.includes(err) &&
|
||||
!RPMGetBoolPref("browser.proton.enabled")
|
||||
) {
|
||||
document.body.classList.add("illustrated", err);
|
||||
}
|
||||
if (err == "blockedByPolicy") {
|
||||
document.body.classList.add("blocked");
|
||||
}
|
||||
|
@ -924,7 +908,7 @@ function setCertErrorDetails(event) {
|
|||
"wrongSystemTime_systemDate1"
|
||||
).textContent = systemDate;
|
||||
if (clockSkew) {
|
||||
document.body.classList.add("illustrated", "clockSkewError");
|
||||
document.body.classList.add("clockSkewError");
|
||||
document.l10n.setAttributes(titleElement, "clockSkewError-title");
|
||||
let clockErrDesc = document.getElementById("ed_clockSkewError");
|
||||
desc = document.getElementById("errorShortDescText");
|
||||
|
@ -933,10 +917,6 @@ function setCertErrorDetails(event) {
|
|||
// eslint-disable-next-line no-unsanitized/property
|
||||
desc.innerHTML = clockErrDesc.innerHTML;
|
||||
}
|
||||
let errorPageContainer = document.getElementById("errorPageContainer");
|
||||
let textContainer = document.getElementById("text-container");
|
||||
errorPageContainer.style.backgroundPosition = `left top calc(50vh - ${textContainer.clientHeight /
|
||||
2}px)`;
|
||||
} else {
|
||||
let targetElems = document.querySelectorAll(
|
||||
"#wrongSystemTime_systemDate2"
|
||||
|
|
|
@ -71,20 +71,6 @@ body {
|
|||
body {
|
||||
padding: 0 12px;
|
||||
}
|
||||
|
||||
/* At some point the screen gets so small that the cute
|
||||
* critter image takes up too much valuable screen real
|
||||
* estate to keep it showing. */
|
||||
#errorPageContainer {
|
||||
background-image: none !important;
|
||||
}
|
||||
|
||||
/* When the critter is hidden, also use the full screen
|
||||
* size for the error text */
|
||||
.illustrated #text-container {
|
||||
margin: unset;
|
||||
padding-inline-start: 0;
|
||||
}
|
||||
}
|
||||
|
||||
@media only screen and (max-height: 480px) {
|
||||
|
|
|
@ -92,7 +92,6 @@ let RemotePageAccessManager = {
|
|||
"security.certerrors.tls.version.show-override",
|
||||
"security.xfocsp.errorReporting.automatic",
|
||||
"security.xfocsp.errorReporting.enabled",
|
||||
"browser.proton.enabled",
|
||||
],
|
||||
RPMSetBoolPref: [
|
||||
"security.tls.version.enable-deprecated",
|
||||
|
|
Загрузка…
Ссылка в новой задаче