From 610a3f0799ccd5e88a5ded421cdbced82ee99af7 Mon Sep 17 00:00:00 2001
From: Franklin van de Meent <fr@nkl.in>
Date: Sun, 20 Aug 2017 11:16:42 +0200
Subject: [PATCH] More clean up

---
 speedtest.htm | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/speedtest.htm b/speedtest.htm
index acd1c75..e015ae2 100644
--- a/speedtest.htm
+++ b/speedtest.htm
@@ -167,11 +167,15 @@
        */
 
       function testDone () {
-        const diff = dec ((Date.now() - start) / 1000, 2);
+        const diff = (Date.now() - start) / 1000;
+
+        if (req.readyState !== 4) {
+          return;
+        }
 
         document.querySelector ('progress').style.visibility = 'hidden';
         document.querySelector ('#result').className = 'resultDone';
-        document.querySelector ('#eta').innerHTML = diff + ' sec';
+        document.querySelector ('#eta').innerHTML = dec (diff, 2) + ' sec';
         req = null;
       }
 
@@ -234,13 +238,10 @@
         document.querySelector ('progress').value = 0;
         document.querySelector ('progress').style.visibility = 'visible';
 
-        req.onreadystatechange = () => {
-          if (req.readyState === 4) {
-            testDone ();
-          }
-        };
-
         req.onprogress = testRunning;
+        req.onreadystatechange = testDone;
+
+        // load file avoiding the cache
         req.open ('GET', ev.target.dataset.file + '?' + start, true);
         req.send (null);
       }