comparison js/core.js @ 3131:735d96d343f6

Fixed #287

         }
     };
 
     this.proceedClicked = function () {
         // Each time the popup button is clicked!
-        if (testState.stateIndex === -1 && specification.calibration) {
-            advanceState();
-            return;
-        }
         var node = this.popupOptions[this.currentIndex],
             pass = true,
             timeDelta = (new Date() - lastNodeStart) / 1000.0;
+        if (node == undefined) {
+            advanceState();
+        }
         if (timeDelta < node.specification.minWait) {
             interfaceContext.lightbox.post("Error", "Not enough time has elapsed, please wait " + (node.specification.minWait - timeDelta).toFixed(0) + " seconds");
             return;
         }
         node.elapsedTime = timeDelta;

             this.hidePopup();
             this.popupOptions.forEach(function (node) {
                 this.store.postResult(node);
             }, this);
             this.store.complete();
-            testState.stateIndex++;
             advanceState();
         }
     };
 
     this.previousClick = function () {

         }
         if (this.stateIndex > -2) {
             storage.update();
         }
         if (this.stateIndex == -2) {
+            this.stateIndex++;
             if (this.preTestSurvey !== undefined) {
                 popup.initState(this.preTestSurvey, storage.globalPreTest);
             } else {
-                this.stateIndex++;
                 this.advanceState();
             }
         } else if (this.stateIndex == -1) {
             if (interfaceContext.calibrationTests.checkFrequencies) {
                 popup.showPopup();