summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-07-26 17:59:09 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-07-26 17:59:09 +0200
commitddd7d45862e89d462851d226c8c29e2602633e05 (patch)
treecc59ebae909a6ad66a00b4a1679bb1260638cd84
parent6e4c8dd34bd905b24f7e0e6a4ef868eeaf61134d (diff)
parentc904349ce229f576c586ae4760197e02b461ea26 (diff)
downloadUXP-ddd7d45862e89d462851d226c8c29e2602633e05.tar
UXP-ddd7d45862e89d462851d226c8c29e2602633e05.tar.gz
UXP-ddd7d45862e89d462851d226c8c29e2602633e05.tar.lz
UXP-ddd7d45862e89d462851d226c8c29e2602633e05.tar.xz
UXP-ddd7d45862e89d462851d226c8c29e2602633e05.zip
Merge branch 'master' of https://github.com/MoonchildProductions/UXP
-rw-r--r--application/basilisk/base/content/aboutNetError.xhtml16
-rw-r--r--application/basilisk/base/content/content.js3
-rw-r--r--application/basilisk/themes/shared/aboutNetError.css4
3 files changed, 0 insertions, 23 deletions
diff --git a/application/basilisk/base/content/aboutNetError.xhtml b/application/basilisk/base/content/aboutNetError.xhtml
index f28e2365f..3296600c8 100644
--- a/application/basilisk/base/content/aboutNetError.xhtml
+++ b/application/basilisk/base/content/aboutNetError.xhtml
@@ -212,9 +212,6 @@
}
if (err == "sslv3Used") {
- document.getElementById("learnMoreContainer").style.display = "block";
- var learnMoreLink = document.getElementById("learnMoreLink");
- learnMoreLink.href = "https://support.mozilla.org/kb/how-resolve-sslv3-error-messages-firefox";
document.body.className = "certerror";
}
@@ -258,17 +255,6 @@
window.addEventListener("AboutNetErrorOptions", function(evt) {
// Pinning errors are of type nssFailure2
if (getErrorCode() == "nssFailure2" || getErrorCode() == "weakCryptoUsed") {
- document.getElementById("learnMoreContainer").style.display = "block";
- var learnMoreLink = document.getElementById("learnMoreLink");
- // nssFailure2 also gets us other non-overrideable errors. Choose
- // a "learn more" link based on description:
- if (getDescription().includes("mozilla_pkix_error_key_pinning_failure")) {
- learnMoreLink.href = "https://support.mozilla.org/kb/certificate-pinning-reports";
- }
- if (getErrorCode() == "weakCryptoUsed") {
- learnMoreLink.href = "https://support.mozilla.org/kb/how-resolve-weak-crypto-error-messages-firefox";
- }
-
const hasPrefStyleError = [
"interrupted", // This happens with subresources that are above the max tls
"SSL_ERROR_PROTOCOL_VERSION_ALERT",
@@ -336,8 +322,6 @@
addAutofocus("returnButton");
setupAdvancedButton(true);
- document.getElementById("learnMoreContainer").style.display = "block";
-
let event = new CustomEvent("AboutNetErrorLoad", {bubbles:true});
document.getElementById("advancedButton").dispatchEvent(event);
diff --git a/application/basilisk/base/content/content.js b/application/basilisk/base/content/content.js
index 88e58b501..5accbdf7b 100644
--- a/application/basilisk/base/content/content.js
+++ b/application/basilisk/base/content/content.js
@@ -298,12 +298,10 @@ var AboutNetAndCertErrorListener = {
onCertErrorDetails(msg) {
let div = content.document.getElementById("certificateErrorText");
div.textContent = msg.data.info;
- let learnMoreLink = content.document.getElementById("learnMoreLink");
let baseURL = Services.urlFormatter.formatURLPref("app.support.baseURL");
switch (msg.data.code) {
case SEC_ERROR_UNKNOWN_ISSUER:
- learnMoreLink.href = baseURL + "security-error";
break;
// in case the certificate expired we make sure the system clock
@@ -336,7 +334,6 @@ var AboutNetAndCertErrorListener = {
content.document.getElementById("wrongSystemTimePanel")
.style.display = "block";
}
- learnMoreLink.href = baseURL + "time-errors";
break;
}
},
diff --git a/application/basilisk/themes/shared/aboutNetError.css b/application/basilisk/themes/shared/aboutNetError.css
index 168d2e893..7e1e7c32b 100644
--- a/application/basilisk/themes/shared/aboutNetError.css
+++ b/application/basilisk/themes/shared/aboutNetError.css
@@ -39,10 +39,6 @@ button:disabled {
display: none;
}
-#learnMoreContainer {
- display: none;
-}
-
#certErrorAndCaptivePortalButtonContainer {
display: none;
}