# HG changeset patch
# User Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk>
# Date 1461746352 -3600
# Node ID c63df53cbd103b9fc47f40fc3115d43e9c7b0152
# Parent  fd711d12dd145ad3f33b54e17f85b5c08489b120# Parent  5a2aaa964f6d703e0ae9b2e2eaa62ccdcbbb6591
Merge branch 'Dev_main'

diff -r 5a2aaa964f6d -r c63df53cbd10 index.html
--- a/index.html	Wed Apr 27 09:38:45 2016 +0100
+++ b/index.html	Wed Apr 27 09:39:12 2016 +0100
@@ -56,7 +56,7 @@
 				<li><a href="index.html?url=example_eval/AB_example.xml" target="_blank">AB interface test example</a></li>
 				<li><a href="index.html?url=example_eval/horizontal_example.xml" target="_blank">Horizontal interface test example</a></li>
 				<li><a href="index.html?url=example_eval/radio_example.xml" target="_blank">Radio interface test example</a></li>
-				<li><a href="test_create/test_create.html" target="_blank">Test creator</a></li>
+				<li><a href="test_create.html" target="_blank">Test creator</a></li>
 				<li><a href="analyse.html" target="_blank">Analysis and diagnostics of results</a></li>
 			</ul>
 			<br>
diff -r 5a2aaa964f6d -r c63df53cbd10 interfaces/ABX.js
--- a/interfaces/ABX.js	Wed Apr 27 09:38:45 2016 +0100
+++ b/interfaces/ABX.js	Wed Apr 27 09:39:12 2016 +0100
@@ -206,17 +206,17 @@
 			interfaceContext.comparator.selected = id;
             if ($(event.currentTarget).hasClass("selected")) {
                 $(".comparator-selector").removeClass('selected');
-                for (var i=0; i<interfaceContext.comparator.comparators.length; i++)
+                for (var i=0; i<interfaceContext.comparator.pair.length; i++)
                 {
-                     var obj = interfaceContext.comparator.comparators[i];
+                     var obj = interfaceContext.comparator.pair[i];
                     obj.parent.metric.moved(time,0);
                 }
             } else {
                 $(".comparator-selector").removeClass('selected');
                 $(event.currentTarget).addClass('selected');
-                for (var i=0; i<interfaceContext.comparator.comparators.length; i++)
+                for (var i=0; i<interfaceContext.comparator.pair.length; i++)
                 {
-                    var obj = interfaceContext.comparator.comparators[i];
+                    var obj = interfaceContext.comparator.pair[i];
                     if (i == id) {
                         obj.value = 1;
                     } else {
@@ -346,7 +346,7 @@
         this.boxHolders.appendChild(node.box);
     }
     var elementId = Math.floor(Math.random() * 2); //Randomly pick A or B to be X
-    var element = new page.audioElementNode();
+    var element = new page.audioElementNode(specification);
     for (var atr in page.audioElements[elementId]) {
         eval("element."+atr+" = page.audioElements[elementId]."+atr);
     }