Mercurial > hg > webaudioevaluationtool
diff interfaces/AB.js @ 2651:22efb2d04bc9
#6: Added for rest
author | Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk> |
---|---|
date | Thu, 19 Jan 2017 16:44:47 +0000 |
parents | e3cf3c24149e |
children | 0fafb872a1a3 |
line wrap: on
line diff
--- a/interfaces/AB.js Thu Jan 19 16:24:00 2017 +0000 +++ b/interfaces/AB.js Thu Jan 19 16:44:47 2017 +0000 @@ -135,7 +135,7 @@ function loadTest(audioHolderObject) { var feedbackHolder = document.getElementById('feedbackHolder'); - var interfaceObj = audioHolderObject.interfaces; + var interfaceObj = interfaceContext.getCombinedInterfaces(audioHolderObject); if (interfaceObj.length > 1) { console.log("WARNING - This interface only supports one <interface> node per page. Using first interface node"); } @@ -157,7 +157,7 @@ document.getElementById("pageTitle").textContent = interfaceObj.title; } - var interfaceOptions = specification.interfaces.options.concat(interfaceObj.options); + var interfaceOptions = interfaceObj.options; // Clear the interfaceElements { var node = document.getElementById('playback-holder'); @@ -395,10 +395,8 @@ } function buttonSubmitClick() { - var checks = []; - checks = checks.concat(testState.currentStateMap.interfaces[0].options); - checks = checks.concat(specification.interfaces.options); - var canContinue = true; + var checks = testState.currentStateMap.interfaces[0].options, + canContinue = true; for (var i = 0; i < checks.length; i++) { if (checks[i].type == 'check') {