# HG changeset patch
# User Nicholas Jillings <n.g.r.jillings@se14.qmul.ac.uk>
# Date 1433437416 -3600
# Node ID b33a22cb6e98bc333ab34be992cb37b10f7f2051
# Parent  aaeebbacc1594552f1daa2919347f50d078c3eb8
Small fixes. <interface> tag properly processed by ape.js

diff -r aaeebbacc159 -r b33a22cb6e98 ape.js
--- a/ape.js	Thu Jun 04 17:23:32 2015 +0100
+++ b/ape.js	Thu Jun 04 18:03:36 2015 +0100
@@ -177,39 +177,40 @@
 	canvas.innerHTML = null;
 	
 	// Setup question title
-	var interfaceObj = $(audioHolderObject).find('interface');
-	var titleNode = interfaceObj.find('title');
-	if (titleNode[0] != undefined)
-	{
-		document.getElementById('pageTitle').textContent = titleNode[0].textContent;
-	}
-	var positionScale = canvas.style.width.substr(0,canvas.style.width.length-2);
-	var offset = Number(document.getElementById('slider').attributes['marginsize'].value);
-	var scale = document.getElementById('sliderScaleHolder');
-	scale.innerHTML = null;
-	interfaceObj.find('scale').each(function(index,scaleObj){
-		var value = document.createAttribute('value');
-		var position = Number(scaleObj.attributes['position'].value)*0.01;
-		value.nodeValue = position;
-		var pixelPosition = (position*positionScale)+offset;
-		var scaleDOM = document.createElement('span');
-		scaleDOM.textContent = scaleObj.textContent;
-		scale.appendChild(scaleDOM);
-		scaleDOM.style.left = Math.floor((pixelPosition-($(scaleDOM).width()/2)))+'px';
-		scaleDOM.setAttributeNode(value);
-	});
-	
-	var commentBoxPrefix = interfaceObj.find('commentBoxPrefix');
-	if (commentBoxPrefix.length != 0) {
-		commentBoxPrefix = commentBoxPrefix[0].textContent;
-	} else {
-		commentBoxPrefix = "Comment on track";
+	var interfaceObj = audioHolderObject.interfaces;
+	var commentBoxPrefix = "Comment on track";
+	if (interfaceObj.length != 0) {
+		interfaceObj = interfaceObj[0];
+		var titleNode = interfaceObj.title;
+		if (titleNode != undefined)
+		{
+			document.getElementById('pageTitle').textContent = titleNode;
+		}
+		var positionScale = canvas.style.width.substr(0,canvas.style.width.length-2);
+		var offset = Number(document.getElementById('slider').attributes['marginsize'].value);
+		var scale = document.getElementById('sliderScaleHolder');
+		scale.innerHTML = null;
+		$(interfaceObj.scale).each(function(index,scaleObj){
+			var value = document.createAttribute('value');
+			var position = Number(scaleObj[0])*0.01;
+			value.nodeValue = position;
+			var pixelPosition = (position*positionScale)+offset;
+			var scaleDOM = document.createElement('span');
+			scaleDOM.textContent = scaleObj[1];
+			scale.appendChild(scaleDOM);
+			scaleDOM.style.left = Math.floor((pixelPosition-($(scaleDOM).width()/2)))+'px';
+			scaleDOM.setAttributeNode(value);
+		});
+		
+		if (interfaceObj.commentBoxPrefix != undefined) {
+			commentBoxPrefix = interfaceObj.commentBoxPrefix;
+		}
 	}
 
 	/// CHECK FOR SAMPLE RATE COMPATIBILITY
 	if (audioHolderObject.sampleRate != undefined) {
 		if (Number(audioHolderObject.sampleRate) != audioContext.sampleRate) {
-			var errStr = 'Sample rates do not match! Requested '+Number(hostFs)+', got '+audioContext.sampleRate+'. Please set the sample rate to match before completing this test.';
+			var errStr = 'Sample rates do not match! Requested '+Number(audioHolderObject.sampleRate)+', got '+audioContext.sampleRate+'. Please set the sample rate to match before completing this test.';
 			alert(errStr);
 			return;
 		}
diff -r aaeebbacc159 -r b33a22cb6e98 core.js
--- a/core.js	Thu Jun 04 17:23:32 2015 +0100
+++ b/core.js	Thu Jun 04 18:03:36 2015 +0100
@@ -976,10 +976,10 @@
 		this.projectReturn = setupNode.getAttribute('projectReturn');
 		if (setupNode.getAttribute('randomiseOrder') == "true") {
 			this.randomiseOrder = true;
-		} else {this.setup.randomiseOrder = false;}
+		} else {this.randomiseOrder = false;}
 		if (setupNode.getAttribute('collectMetrics') == "true") {
 			this.collectMetrics = true;
-		} else {this.setup.collectMetrics = false;}
+		} else {this.collectMetrics = false;}
 		var metricCollection = setupNode.getElementsByTagName('Metric');
 		
 		this.preTest = new this.prepostNode('pretest',setupNode.getElementsByTagName('PreTest'));