From b52f1f918e380d70148cca872ddd999a989c79c0 Mon Sep 17 00:00:00 2001 From: Wes Kocher Date: Wed, 30 Aug 2017 14:27:11 -0700 Subject: [PATCH] Backed out changeset 1575ef52aa22 (bug 1394053) for failures in browser_security-1.js,browser_security-2.js,browser_security.js a=bustage CLOSED TREE MozReview-Commit-ID: G8PrqcM5UYf --- .../preferences/in-content-new/privacy.js | 43 +++++++------------ .../preferences/in-content-new/privacy.xul | 2 - .../preferences/in-content/security.js | 43 +++++++------------ .../preferences/in-content/security.xul | 2 - 4 files changed, 30 insertions(+), 60 deletions(-) diff --git a/browser/components/preferences/in-content-new/privacy.js b/browser/components/preferences/in-content-new/privacy.js index 8614d57e2b25..05fb5df32cb9 100644 --- a/browser/components/preferences/in-content-new/privacy.js +++ b/browser/components/preferences/in-content-new/privacy.js @@ -1077,32 +1077,24 @@ var gPrivacyPane = { safeBrowsingMalwarePref.value = enableSafeBrowsing.checked; if (enableSafeBrowsing.checked) { - if (blockDownloads) { - blockDownloads.removeAttribute("disabled"); - if (blockDownloads.checked) { - blockUncommonUnwanted.removeAttribute("disabled"); - } - } else { + blockDownloads.removeAttribute("disabled"); + if (blockDownloads.checked) { blockUncommonUnwanted.removeAttribute("disabled"); } } else { - if (blockDownloads) { - blockDownloads.setAttribute("disabled", "true"); - } + blockDownloads.setAttribute("disabled", "true"); blockUncommonUnwanted.setAttribute("disabled", "true"); } }); - if (blockDownloads) { - blockDownloads.addEventListener("command", function() { - blockDownloadsPref.value = blockDownloads.checked; - if (blockDownloads.checked) { - blockUncommonUnwanted.removeAttribute("disabled"); - } else { - blockUncommonUnwanted.setAttribute("disabled", "true"); - } - }); - } + blockDownloads.addEventListener("command", function() { + blockDownloadsPref.value = blockDownloads.checked; + if (blockDownloads.checked) { + blockUncommonUnwanted.removeAttribute("disabled"); + } else { + blockUncommonUnwanted.setAttribute("disabled", "true"); + } + }); blockUncommonUnwanted.addEventListener("command", function() { blockUnwantedPref.value = blockUncommonUnwanted.checked; @@ -1134,18 +1126,13 @@ var gPrivacyPane = { enableSafeBrowsing.checked = safeBrowsingPhishingPref.value && safeBrowsingMalwarePref.value; if (!enableSafeBrowsing.checked) { - if (blockDownloads) { - blockDownloads.setAttribute("disabled", "true"); - } - + blockDownloads.setAttribute("disabled", "true"); blockUncommonUnwanted.setAttribute("disabled", "true"); } - if (blockDownloads) { - blockDownloads.checked = blockDownloadsPref.value; - if (!blockDownloadsPref.value) { - blockUncommonUnwanted.setAttribute("disabled", "true"); - } + blockDownloads.checked = blockDownloadsPref.value; + if (!blockDownloadsPref.value) { + blockUncommonUnwanted.setAttribute("disabled", "true"); } blockUncommonUnwanted.checked = blockUnwantedPref.value && blockUncommonPref.value; diff --git a/browser/components/preferences/in-content-new/privacy.xul b/browser/components/preferences/in-content-new/privacy.xul index a9190ccbbd2e..42a31527273a 100644 --- a/browser/components/preferences/in-content-new/privacy.xul +++ b/browser/components/preferences/in-content-new/privacy.xul @@ -732,11 +732,9 @@ label="&enableSafeBrowsing.label;" accesskey="&enableSafeBrowsing.accesskey;" /> -#ifdef MOZILLA_OFFICIAL -#endif diff --git a/browser/components/preferences/in-content/security.js b/browser/components/preferences/in-content/security.js index 6eab9296a1b8..6a3d997fd5ad 100644 --- a/browser/components/preferences/in-content/security.js +++ b/browser/components/preferences/in-content/security.js @@ -174,32 +174,24 @@ var gSecurityPane = { safeBrowsingMalwarePref.value = enableSafeBrowsing.checked; if (enableSafeBrowsing.checked) { - if (blockDownloads) { - blockDownloads.removeAttribute("disabled"); - if (blockDownloads.checked) { - blockUncommonUnwanted.removeAttribute("disabled"); - } - } else { + blockDownloads.removeAttribute("disabled"); + if (blockDownloads.checked) { blockUncommonUnwanted.removeAttribute("disabled"); } } else { - if (blockDownloads) { - blockDownloads.setAttribute("disabled", "true"); - } + blockDownloads.setAttribute("disabled", "true"); blockUncommonUnwanted.setAttribute("disabled", "true"); } }); - if (blockDownloads) { - blockDownloads.addEventListener("command", function() { - blockDownloadsPref.value = blockDownloads.checked; - if (blockDownloads.checked) { - blockUncommonUnwanted.removeAttribute("disabled"); - } else { - blockUncommonUnwanted.setAttribute("disabled", "true"); - } - }); - } + blockDownloads.addEventListener("command", function() { + blockDownloadsPref.value = blockDownloads.checked; + if (blockDownloads.checked) { + blockUncommonUnwanted.removeAttribute("disabled"); + } else { + blockUncommonUnwanted.setAttribute("disabled", "true"); + } + }); blockUncommonUnwanted.addEventListener("command", function() { blockUnwantedPref.value = blockUncommonUnwanted.checked; @@ -231,18 +223,13 @@ var gSecurityPane = { enableSafeBrowsing.checked = safeBrowsingPhishingPref.value && safeBrowsingMalwarePref.value; if (!enableSafeBrowsing.checked) { - if (blockDownloads) { - blockDownloads.setAttribute("disabled", "true"); - } - + blockDownloads.setAttribute("disabled", "true"); blockUncommonUnwanted.setAttribute("disabled", "true"); } - if (blockDownloads) { - blockDownloads.checked = blockDownloadsPref.value; - if (!blockDownloadsPref.value) { - blockUncommonUnwanted.setAttribute("disabled", "true"); - } + blockDownloads.checked = blockDownloadsPref.value; + if (!blockDownloadsPref.value) { + blockUncommonUnwanted.setAttribute("disabled", "true"); } blockUncommonUnwanted.checked = blockUnwantedPref.value && blockUncommonPref.value; diff --git a/browser/components/preferences/in-content/security.xul b/browser/components/preferences/in-content/security.xul index 9e6e40b8256e..e22ecb6ef7b7 100644 --- a/browser/components/preferences/in-content/security.xul +++ b/browser/components/preferences/in-content/security.xul @@ -78,11 +78,9 @@ label="&enableSafeBrowsing.label;" accesskey="&enableSafeBrowsing.accesskey;" /> -#ifdef MOZILLA_OFFICIAL -#endif