From 435eedc892fea3adc8cd6316c23e3d78ec5fe48a Mon Sep 17 00:00:00 2001 From: "reed@reedloden.com" Date: Tue, 8 Apr 2008 12:30:01 -0700 Subject: [PATCH] Bug 422410 - "anti malware warning UI should allow pass through / show ignore link" (display the clickthrough for both phishing and malware) [p=johnath@mozilla.com (Johnathan Nightingale [johnath]) r=gavin a=blocking-firefox3+] --- browser/components/safebrowsing/content/blockedSite.xhtml | 5 ----- .../safebrowsing/content/test/browser_bug400731.js | 6 +++--- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/browser/components/safebrowsing/content/blockedSite.xhtml b/browser/components/safebrowsing/content/blockedSite.xhtml index 7199c0d38782..8850462370fb 100644 --- a/browser/components/safebrowsing/content/blockedSite.xhtml +++ b/browser/components/safebrowsing/content/blockedSite.xhtml @@ -147,10 +147,6 @@ el = document.getElementById("errorLongDescText_malware"); el.parentNode.removeChild(el); - // Unhide clickthrough button - el = document.getElementById("ignoreWarningButton"); - el.style.display = "-moz-box"; - // Set sitename document.getElementById("phishing_sitename").textContent = getHostString(); document.title = document.getElementById("errorTitleText_phishing") @@ -174,7 +170,6 @@ top: 23px; left: 20px; font-size: smaller; - display: none; /* Hide the button by default */ } #ignoreWarning { diff --git a/browser/components/safebrowsing/content/test/browser_bug400731.js b/browser/components/safebrowsing/content/test/browser_bug400731.js index d1f4ab7323e2..45293786627a 100644 --- a/browser/components/safebrowsing/content/test/browser_bug400731.js +++ b/browser/components/safebrowsing/content/test/browser_bug400731.js @@ -15,12 +15,12 @@ function test() { } function testMalware() { - // Confirm that "Ignore this warning" is hidden + // Confirm that "Ignore this warning" is visible - bug 422410 var el = newBrowser.contentDocument.getElementById("ignoreWarningButton"); - ok(el, "Ignore warning button should be present (but hidden) for malware"); + ok(el, "Ignore warning button should be present for malware"); var style = newBrowser.contentWindow.getComputedStyle(el, null); - is(style.display, "none", "Ignore Warning button should be display:none for malware"); + is(style.display, "-moz-box", "Ignore Warning button should be display:-moz-box for malware"); // Now launch the phishing test newBrowser.contentWindow.location = 'http://www.mozilla.com/firefox/its-a-trap.html';