comparison js/core.js @ 2604:8188efa9415d

Merge branch 'vnext' into Dev_main # Conflicts: # css/core.css # interfaces/ape.js # js/specification.js # tests/examples/APE_example.xml # tests/examples/mushra_example.xml
author Nicholas Jillings <nicholas.jillings@mail.bcu.ac.uk>
date Mon, 14 Nov 2016 14:49:57 +0000
parents 2d820b7413a7 1c8aac0ee5e9
children 342ef7948c47
comparison
equal deleted inserted replaced
2601:2577d983f291 2604:8188efa9415d
3197 interfaceContext.lightbox.post("Error", str); 3197 interfaceContext.lightbox.post("Error", str);
3198 console.log(str); 3198 console.log(str);
3199 this.storeErrorNode(str); 3199 this.storeErrorNode(str);
3200 return false; 3200 return false;
3201 }; 3201 };
3202 this.checkAllCommented = function () {
3203 var str = "You have not commented on all the fragments.";
3204 var cont = true,
3205 boxes = this.commentBoxes.boxes,
3206 numBoxes = boxes.length,
3207 i;
3208 for (i = 0; i < numBoxes; i++) {
3209 if (boxes[i].trackCommentBox.value === "") {
3210 interfaceContext.lightbox.post("Error", str);
3211 console.log(str);
3212 this.storeErrorNode(str);
3213 return false;
3214 }
3215 }
3216 return true;
3217 }
3202 this.checkScaleRange = function (min, max) { 3218 this.checkScaleRange = function (min, max) {
3203 var page = testState.getCurrentTestPage(); 3219 var page = testState.getCurrentTestPage();
3204 var audioObjects = audioEngineContext.audioObjects; 3220 var audioObjects = audioEngineContext.audioObjects;
3205 var state = true; 3221 var state = true;
3206 var str = "Please keep listening. "; 3222 var str = "Please keep listening. ";