Small rearrangement

Author: MikeBishop

teslausb-www/html/index.html

@@ -1433,31 +1433,27 @@
         result = request.responseText;
       } else {
         log("unexpected pairing response");
-        window.setTimeout(function() { waitforpairing(button, count + 1); }, 5000);
-        return;
+        result = "";
       }
 
       if (result.indexOf("<p>paired</p>") > 0) {
+        log("pairing succeeded");
         var msg=document.getElementById('pairtext');
         msg.textContent="Successfully paired with car.";
-        button.disabled=false;
-        button.textContent="Pair BLE with Car";
-        setbuttonsdisabled('group1', false);
-        setbuttonsdisabled('group2', false);
+      } else if (count > 12) {
+        log("pairing failed");
+        var msg=document.getElementById('pairtext');
+        msg.textContent="Pairing failed. Please try again.";
       } else {
-        if (count > 12) {
-          log("pairing failed");
-          var msg=document.getElementById('pairtext');
-          msg.textContent="Pairing failed. Please try again.";
-          button.disabled=false;
-          button.textContent="Pair BLE with Car";
-          setbuttonsdisabled('group1', false);
-          setbuttonsdisabled('group2', false);
-          return;
-        }
-        log("waiting for pairing");
+        log("Still waiting for pairing");
         window.setTimeout(function() { waitforpairing(button, count + 1); }, 5000);
+        return;
       }
+
+      button.disabled = false;
+      button.textContent = "Pair BLE with Car";
+      setbuttonsdisabled('group1', false);
+      setbuttonsdisabled('group2', false);
     }
   }
   request.send();