Mercurial > hg > webaudioevaluationtool
changeset 2323:ff06a00a1c0a
Merge branch 'master' of https://github.com/BrechtDeMan/WebAudioEvaluationTool
author | www-data <www-data@sucuk.dcs.qmul.ac.uk> |
---|---|
date | Fri, 29 Apr 2016 18:21:03 +0100 |
parents | 472412fab354 (current diff) 1f4aa23ae847 (diff) |
children | d6cc7d948ae9 |
files | |
diffstat | 1 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/js/core.js Fri Apr 29 17:21:06 2016 +0100 +++ b/js/core.js Fri Apr 29 18:21:03 2016 +0100 @@ -2824,6 +2824,8 @@ var str = "Please keep listening. "; var minRanking = Infinity; var maxRanking = -Infinity; + var interface = page.specification.interface; + var isAb = interface === "AB" || interface === "ABX"; for (var ao of audioObjects) { var rank = ao.interfaceDOM.getValue(); if (rank < minRanking) {minRanking = rank;} @@ -2833,8 +2835,12 @@ str += "At least one fragment must be below the "+min+" mark."; state = false; } - if (maxRanking*100 < max) { - str += "At least one fragment must be above the "+max+" mark." + if (maxRanking*100 < max) { + if(isAb){ // if it is AB or ABX let's phrase it differently + str += "You must select a fragment before continuing"; + } else{ + str += "At least one fragment must be above the "+max+" mark." + } state = false; } if (!state) { @@ -2844,7 +2850,6 @@ } return state; } - this.storeErrorNode = function(errorMessage) { var time = audioEngineContext.timer.getTestTime();