Mercurial > hg > webaudioevaluationtool
changeset 1522:40face84bd13
Ape for Firefox fixed
| author | Nicholas Jillings <nickjillings@users.noreply.github.com> |
|---|---|
| date | Mon, 14 Sep 2015 09:23:49 +0100 |
| parents | dfbe08826f64 |
| children | ed1d17b94752 |
| files | ape.js core.js example_eval/project.xml |
| diffstat | 3 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/ape.js Thu Sep 10 15:22:58 2015 +0100 +++ b/ape.js Mon Sep 14 09:23:49 2015 +0100 @@ -424,15 +424,15 @@ var audioObject = audioEngineContext.newTrack(audioHolderObject.outsideReference); - outsideReferenceHolder.onclick = function() + outsideReferenceHolder.onclick = function(event) { audioEngineContext.play(audioEngineContext.audioObjects.length-1); $('.track-slider').removeClass('track-slider-playing'); $('.comment-div').removeClass('comment-box-playing'); - if (event.srcElement.nodeName == 'DIV') { - $(event.srcElement).addClass('track-slider-playing'); + if (event.currentTarget.nodeName == 'DIV') { + $(event.currentTarget).addClass('track-slider-playing'); } else { - $(event.srcElement.parentElement).addClass('track-slider-playing'); + $(event.currentTarget.parentElement).addClass('track-slider-playing'); } };
--- a/core.js Thu Sep 10 15:22:58 2015 +0100 +++ b/core.js Mon Sep 14 09:23:49 2015 +0100 @@ -918,9 +918,9 @@ this.bufferNode.connect(this.outputGain); this.bufferNode.buffer = this.buffer; this.bufferNode.loop = audioEngineContext.loopPlayback; - this.bufferNode.onended = function() { + this.bufferNode.onended = function(event) { // Safari does not like using 'this' to reference the calling object! - event.srcElement.owner.metric.stopListening(audioEngineContext.timer.getTestTime(),event.srcElement.owner.getCurrentPosition()); + event.currentTarget.owner.metric.stopListening(audioEngineContext.timer.getTestTime(),event.currentTarget.owner.getCurrentPosition()); }; if (this.bufferNode.loop == false) { this.metric.startListening(audioEngineContext.timer.getTestTime());
--- a/example_eval/project.xml Thu Sep 10 15:22:58 2015 +0100 +++ b/example_eval/project.xml Mon Sep 14 09:23:49 2015 +0100 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <BrowserEvalProjectDocument> - <setup interface="APE" projectReturn="save.php" randomiseOrder='true' collectMetrics='true' testPages="1"> + <setup interface="APE" projectReturn="save.php" randomiseOrder='true' collectMetrics='true' testPages="2"> <PreTest> <question id="Location" mandatory="true" boxsize="large">Please enter your location.</question> <checkbox id="experience">