# HG changeset patch
# User www-data <www-data@sucuk.dcs.qmul.ac.uk>
# Date 1461079249 -3600
# Node ID 2cc2eba252b459a344bc62d679159d76202d98da
# Parent  cd1126365aa3cd2c684816471792e1b5f02dbcc7# Parent  aa36a634c8a648fd58a79d1dda3460f0f7939872
Merge branch 'master' of https://github.com/BrechtDeMan/WebAudioEvaluationTool

diff -r cd1126365aa3 -r 2cc2eba252b4 analysis/analysis.js
--- a/analysis/analysis.js	Tue Apr 19 15:21:11 2016 +0100
+++ b/analysis/analysis.js	Tue Apr 19 16:20:49 2016 +0100
@@ -774,7 +774,14 @@
                     break;
             }
         }
-        for (var survey_entry of specification.preTest.options.concat(specification.postTest.options)) {
+        var options = [];
+        if(specification.preTest) {
+            options = options.concat(specification.preTest.options);
+        }
+        if (specification.postTest) {
+            options = options.concat(specification.postTest.options);
+        }
+        for (var survey_entry of options) {
             switch(survey_entry.type) {
                 case "number":
                 case "radio":
diff -r cd1126365aa3 -r 2cc2eba252b4 js/specification.js
--- a/js/specification.js	Tue Apr 19 15:21:11 2016 +0100
+++ b/js/specification.js	Tue Apr 19 16:20:49 2016 +0100
@@ -356,11 +356,11 @@
 			var scaleParent = xml.getElementsByTagName('scales');
 			if (scaleParent.length == 1) {
 				scaleParent = scaleParent[0];
-				for (var i=0; i<scaleParent.children.length; i++) {
-					var child = scaleParent.children[i];
+                var scalelabels = scaleParent.getAllElementsByTagName('scalelabel');
+				for (var i=0; i<scalelabels.length; i++) {
 					this.scales.push({
-						text: child.textContent,
-						position: Number(child.getAttribute('position'))
+						text: scalelabels[i].textContent,
+						position: Number(scalelabels[i].getAttribute('position'))
 					});
 				}
 			}