# HG changeset patch # User www-data # Date 1461950463 -3600 # Node ID ff06a00a1c0ad1544190a0e83bd485d211d7beaf # Parent 472412fab35416ea40f71f1615ac22d5a1fc9ca8# Parent 1f4aa23ae8474d09d3766e1e810a4ea4f29e55ca Merge branch 'master' of https://github.com/BrechtDeMan/WebAudioEvaluationTool diff -r 472412fab354 -r ff06a00a1c0a js/core.js --- 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();