# HG changeset patch # User Nicholas Jillings # Date 1484843040 0 # Node ID 41b7fcd245da020f00f2aff6bf5f89bf32f9450d # Parent 8f3ea7ce794b53763cd09add79409053e5f2614e #6: Converted MUSHRA diff -r 8f3ea7ce794b -r 41b7fcd245da interfaces/mushra.js --- a/interfaces/mushra.js Thu Jan 19 16:15:47 2017 +0000 +++ b/interfaces/mushra.js Thu Jan 19 16:24:00 2017 +0000 @@ -121,7 +121,7 @@ var feedbackHolder = document.getElementById('feedbackHolder'); feedbackHolder.innerHTML = ""; - var interfaceObj = audioHolderObject.interfaces; + var interfaceObj = interfaceContext.getCombinedInterfaces(audioHolderObject); if (interfaceObj.length > 1) { console.log("WARNING - This interface only supports one node per page. Using first interface node"); } @@ -197,7 +197,7 @@ } - var interfaceOptions = specification.interfaces.options.concat(interfaceObj.options); + var interfaceOptions = interfaceObj.options; for (var option of interfaceOptions) { if (option.type == "show") { switch (option.name) { @@ -208,7 +208,7 @@ playbackHolder.style.width = "100%"; playbackHolder.align = 'center'; playbackHolder.appendChild(interfaceContext.playhead.object); - feedbackHolder.appendChild(playbackHolder); + feedbackHolder.insertBefore(playbackHolder, feedbackHolder.firstElementChild); } break; case "page-count": @@ -451,10 +451,8 @@ function buttonSubmitClick() // TODO: Only when all songs have been played! { - 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; // Check that the anchor and reference objects are correctly placed if (interfaceContext.checkHiddenAnchor() == false) {