Mercurial > hg > webaudioevaluationtool
changeset 2292:b99f37fda80c
Merge branch 'master' of https://github.com/BrechtDeMan/WebAudioEvaluationTool
| author | www-data <www-data@sucuk.dcs.qmul.ac.uk> |
|---|---|
| date | Tue, 26 Apr 2016 02:21:03 +0100 |
| parents | 7480adff90b8 (current diff) fd711d12dd14 (diff) |
| children | c588522dda07 |
| files | |
| diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/interfaces/ABX.js Mon Apr 25 19:21:01 2016 +0100 +++ b/interfaces/ABX.js Tue Apr 26 02:21:03 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); }