Commit f5e9792b authored by sajolida's avatar sajolida
Browse files

Fix buggy merge conflicts from aa2e4ead

parent df3e78b9
...@@ -271,10 +271,10 @@ document.addEventListener("DOMContentLoaded", function() { ...@@ -271,10 +271,10 @@ document.addEventListener("DOMContentLoaded", function() {
opaque(document.getElementById("continue-link-bittorrent")); opaque(document.getElementById("continue-link-bittorrent"));
// Display "Verify with your browser" when image is clicked // Display "Verify with your browser" when image is clicked
document.getElementById("download-img").onclick = function(e) { displayVerificationExtension(e); } document.getElementById("download-img").onclick = function(e) { displayVerificationExtension(e, this); }
document.getElementById("download-iso").onclick = function(e) { displayVerificationExtension(e); } document.getElementById("download-iso").onclick = function(e) { displayVerificationExtension(e, this); }
function displayVerificationExtension(e) { function displayVerificationExtension(e, elm) {
try { try {
e.preventDefault(); e.preventDefault();
hitCounter("download-image"); hitCounter("download-image");
...@@ -283,7 +283,7 @@ document.addEventListener("DOMContentLoaded", function() { ...@@ -283,7 +283,7 @@ document.addEventListener("DOMContentLoaded", function() {
} finally { } finally {
// Setting window.location.href will abort AJAX requests resulting // Setting window.location.href will abort AJAX requests resulting
// in a NetworkError depending on the timing and browser. // in a NetworkError depending on the timing and browser.
window.open(this.getAttribute("href"), "_blank"); window.open(elm.getAttribute("href"), "_blank");
} }
} }
...@@ -295,10 +295,10 @@ document.addEventListener("DOMContentLoaded", function() { ...@@ -295,10 +295,10 @@ document.addEventListener("DOMContentLoaded", function() {
} }
// Reset verification when downloading again after failure // Reset verification when downloading again after failure
document.getElementById("download-img-again").onclick = function(e) { resetVerification(e); } document.getElementById("download-img-again").onclick = function(e) { resetVerification(e, this); }
document.getElementById("download-iso-again").onclick = function(e) { resetVerification(e); } document.getElementById("download-iso-again").onclick = function(e) { resetVerification(e, this); }
function resetVerification(e) { function resetVerification(e, elm) {
try { try {
e.preventDefault(); e.preventDefault();
hitCounter("download-image-again"); hitCounter("download-image-again");
...@@ -307,7 +307,7 @@ document.addEventListener("DOMContentLoaded", function() { ...@@ -307,7 +307,7 @@ document.addEventListener("DOMContentLoaded", function() {
} finally { } finally {
// Setting window.location.href will abort AJAX requests resulting // Setting window.location.href will abort AJAX requests resulting
// in a NetworkError depending on the timing and browser. // in a NetworkError depending on the timing and browser.
window.open(this.getAttribute("href"), "_blank"); window.open(elm.getAttribute("href"), "_blank");
} }
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment