Mercurial > hg > webaudioevaluationtool
comparison 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 |
comparison
equal
deleted
inserted
replaced
2650:41b7fcd245da | 2651:22efb2d04bc9 |
---|---|
133 testState.advanceState(); | 133 testState.advanceState(); |
134 } | 134 } |
135 | 135 |
136 function loadTest(audioHolderObject) { | 136 function loadTest(audioHolderObject) { |
137 var feedbackHolder = document.getElementById('feedbackHolder'); | 137 var feedbackHolder = document.getElementById('feedbackHolder'); |
138 var interfaceObj = audioHolderObject.interfaces; | 138 var interfaceObj = interfaceContext.getCombinedInterfaces(audioHolderObject); |
139 if (interfaceObj.length > 1) { | 139 if (interfaceObj.length > 1) { |
140 console.log("WARNING - This interface only supports one <interface> node per page. Using first interface node"); | 140 console.log("WARNING - This interface only supports one <interface> node per page. Using first interface node"); |
141 } | 141 } |
142 interfaceObj = interfaceObj[0]; | 142 interfaceObj = interfaceObj[0]; |
143 | 143 |
155 | 155 |
156 if (interfaceObj.title != null) { | 156 if (interfaceObj.title != null) { |
157 document.getElementById("pageTitle").textContent = interfaceObj.title; | 157 document.getElementById("pageTitle").textContent = interfaceObj.title; |
158 } | 158 } |
159 | 159 |
160 var interfaceOptions = specification.interfaces.options.concat(interfaceObj.options); | 160 var interfaceOptions = interfaceObj.options; |
161 // Clear the interfaceElements | 161 // Clear the interfaceElements |
162 { | 162 { |
163 var node = document.getElementById('playback-holder'); | 163 var node = document.getElementById('playback-holder'); |
164 if (node) { | 164 if (node) { |
165 feedbackHolder.removeChild(node); | 165 feedbackHolder.removeChild(node); |
393 outsideRef.style.left = (window.innerWidth - 120) / 2 + 'px'; | 393 outsideRef.style.left = (window.innerWidth - 120) / 2 + 'px'; |
394 } | 394 } |
395 } | 395 } |
396 | 396 |
397 function buttonSubmitClick() { | 397 function buttonSubmitClick() { |
398 var checks = []; | 398 var checks = testState.currentStateMap.interfaces[0].options, |
399 checks = checks.concat(testState.currentStateMap.interfaces[0].options); | 399 canContinue = true; |
400 checks = checks.concat(specification.interfaces.options); | |
401 var canContinue = true; | |
402 | 400 |
403 for (var i = 0; i < checks.length; i++) { | 401 for (var i = 0; i < checks.length; i++) { |
404 if (checks[i].type == 'check') { | 402 if (checks[i].type == 'check') { |
405 switch (checks[i].name) { | 403 switch (checks[i].name) { |
406 case 'fragmentPlayed': | 404 case 'fragmentPlayed': |