Mercurial > hg > webaudioevaluationtool
diff core.js @ 469:d39d243e6601 Dev_main
Outside references now have an interfaceDOM. All interfaceDOM objects must respond to canMove() for determining if fixed or not.
author | Nicholas Jillings <n.g.r.jillings@se14.qmul.ac.uk> |
---|---|
date | Tue, 12 Jan 2016 18:29:55 +0000 |
parents | 44f7a5013b94 |
children | 1330c77d212c |
line wrap: on
line diff
--- a/core.js Tue Jan 12 17:26:40 2016 +0000 +++ b/core.js Tue Jan 12 18:29:55 2016 +0000 @@ -1238,12 +1238,15 @@ this.storeDOM.appendChild(file); if (this.specification.type != 'outside-reference') { var interfaceXML = this.interfaceDOM.exportXMLDOM(this); - if (interfaceXML.length == undefined) { - this.storeDOM.appendChild(interfaceXML); - } else { - for (var i=0; i<interfaceXML.length; i++) - { - this.storeDOM.appendChild(interfaceXML[i]); + if (interfaceXML != null) + { + if (interfaceXML.length == undefined) { + this.storeDOM.appendChild(interfaceXML); + } else { + for (var i=0; i<interfaceXML.length; i++) + { + this.storeDOM.appendChild(interfaceXML[i]); + } } } if (this.commentDOM != null) { @@ -2730,8 +2733,8 @@ if (passed == false) { check_pass = false; - console.log("Continue listening to track-"+i); - error_obj.push(i); + console.log("Continue listening to track-"+audioEngineContext.audioObjects.interfaceDOM.getPresentedId()); + error_obj.push(audioEngineContext.audioObjects.interfaceDOM.getPresentedId()); } } if (check_pass == false) @@ -2754,11 +2757,11 @@ { var str = "You have not moved "; var failed = []; - for (var i in audioEngineContext.audioObjects) + for (var ao of audioEngineContext.audioObjects) { - if(audioEngineContext.audioObjects[i].metric.wasMoved == false && audioEngineContext.audioObjects[i].specification.type != 'outsidereference') + if(ao.metric.wasMoved == false && ao.interfaceDOM.canMove() == true) { - failed.push(audioEngineContext.audioObjects[i].id); + failed.push(ao.interfaceDOM.getPresentedId()); } } if (failed.length == 0) @@ -2784,11 +2787,11 @@ { var str = "You have not played "; var failed = []; - for (var i in audioEngineContext.audioObjects) + for (var ao of audioEngineContext.audioObjects) { - if(audioEngineContext.audioObjects[i].metric.wasListenedTo == false) + if(ao.metric.wasListenedTo == false) { - failed.push(audioEngineContext.audioObjects[i].id); + failed.push(ao.interfaceDOM.getPresentedId()); } } if (failed.length == 0)