Merge remote-tracking branch 'origin/feature/15292-usb-image' into feature/15292-usb-image

wiki/src/install/inc/js/download.js

@@ -271,19 +271,19 @@ document.addEventListener("DOMContentLoaded", function() {
   opaque(document.getElementById("continue-link-bittorrent"));
 
   // Display "Verify with your browser" when image is clicked
-  document.getElementById("download-img").onclick = function(e) { displayVerificationExtension(e); }
-  document.getElementById("download-iso").onclick = function(e) { displayVerificationExtension(e); }
+  document.getElementById("download-img").onclick = function(e) { displayVerificationExtension(e, this); }
+  document.getElementById("download-iso").onclick = function(e) { displayVerificationExtension(e, this); }
 
-  function displayVerificationExtension(e) {
+  function displayVerificationExtension(e, elm) {
     try {
       e.preventDefault();
-      hitCounter("download-iso");
+      hitCounter("download-image");
       toggleDirectBitTorrent("direct");
       resetVerificationResult();
     } finally {
       // Setting window.location.href will abort AJAX requests resulting
       // in a NetworkError depending on the timing and browser.
-      window.open(this.getAttribute("href"), "_blank");
+      window.open(elm.getAttribute("href"), "_blank");
     }
   }
 
@@ -295,17 +295,19 @@ document.addEventListener("DOMContentLoaded", function() {
   }
 
   // Reset verification when downloading again after failure
-  document.getElementById("download-img-again").onclick = function(e) { resetVerification(e); }
-  document.getElementById("download-iso-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, this); }
 
-  function resetVerification(e) {
+  function resetVerification(e, elm) {
     try {
       e.preventDefault();
-      hitCounter("download-iso-again");
+      hitCounter("download-image-again");
       toggleDirectBitTorrent("direct");
       resetVerificationResult();
     } finally {
-      window.location = this.getAttribute("href");
+      // Setting window.location.href will abort AJAX requests resulting
+      // in a NetworkError depending on the timing and browser.
+      window.open(elm.getAttribute("href"), "_blank");
     }
   }