changeset 2445:8a4ed73cfa4c

Merge branch 'master' of https://github.com/BrechtDeMan/WebAudioEvaluationTool
author www-data <www-data@sucuk.dcs.qmul.ac.uk>
date Thu, 23 Jun 2016 13:20:47 +0100
parents 23e6eb6d416c (current diff) 49ceb4d0f967 (diff)
children 61dba2f2c9dd
files
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/js/core.js	Mon Jun 13 16:20:54 2016 +0100
+++ b/js/core.js	Thu Jun 23 13:20:47 2016 +0100
@@ -1116,6 +1116,7 @@
                         elements.push(elem);
                     }
                 }
+                elements = elements.reverse();
 				if (this.currentStateMap.randomiseOrder)
 				{
 					elements = randomiseOrder(elements);
@@ -2853,7 +2854,7 @@
 			var passed = false;
 			for (var j=0; j<metric.listenTracker.length; j++)
 			{
-				var bt = metric.listenTracker[j].getElementsByTagName('buffertime');
+				var bt = metric.listenTracker[j].getElementsByTagName('testtime');
 				var start_time = Number(bt[0].getAttribute('start'));
 				var stop_time = Number(bt[0].getAttribute('stop'));
 				var delta = stop_time - start_time;
@@ -2885,7 +2886,9 @@
 			console.log("[ALERT]: "+str_start);
             this.storeErrorNode("[ALERT]: "+str_start);
 			interfaceContext.lightbox.post("Error",str_start);
+            return false;
 		}
+        return true;
 	};
 	this.checkAllMoved = function()
 	{