changeset 2698:0562dcdfd5eb

Minor fixes to APE and core
author Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk>
date Mon, 13 Mar 2017 11:08:51 +0000
parents 67db38680bc0
children 6350ae016862
files interfaces/ape.js js/core.js
diffstat 2 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/interfaces/ape.js	Mon Mar 13 10:46:31 2017 +0000
+++ b/interfaces/ape.js	Mon Mar 13 11:08:51 2017 +0000
@@ -84,8 +84,8 @@
         }
         return state;
     };
-
-    Interface.prototype.checkAllCommented = function () {
+    /*
+    interfaceContext.checkAllCommented = function () {
         var audioObjs = audioEngineContext.audioObjects;
         var audioHolder = testState.stateMap[testState.stateIndex];
         var state = true;
@@ -128,8 +128,8 @@
         }
         return state;
     };
-
-    Interface.prototype.checkScaleRange = function () {
+    */
+    interfaceContext.checkScaleRange = function () {
         var audioObjs = audioEngineContext.audioObjects;
         var audioHolder = testState.stateMap[testState.stateIndex];
         var interfaceObject = this.interfaceSliders[0].interfaceObject;
--- a/js/core.js	Mon Mar 13 10:46:31 2017 +0000
+++ b/js/core.js	Mon Mar 13 11:08:51 2017 +0000
@@ -1378,7 +1378,7 @@
                     this.currentStatePosition = 'post';
                     // Save the data
                     this.testPageCompleted();
-                    if (this.currentStateMap.postTest === null) {
+                    if (this.currentStateMap.postTest === undefined) {
                         this.advanceState();
                         return;
                     } else {
@@ -3161,7 +3161,7 @@
 
     this.checkHiddenReference = function () {
         var references = audioEngineContext.audioObjects.filter(function (ao) {
-            return ao.specification.type === "references";
+            return ao.specification.type === "reference";
         });
         var state = references.some(function (ao) {
             return (ao.interfaceDOM.getValue() < (ao.specification.marker / 100) && ao.specification.marker > 0);