HoshinoKoji/jsPsych
1
0
Fork 0
mirror of https://github.com/jspsych/jsPsych.git synced 2025-05-10 11:10:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug fix - moved where on_trial_finish is called to ensure it is called at the end of every trial

Browse Source
This commit is contained in:
Josh de Leeuw 2012-07-17 18:49:46 -04:00
parent 946f1aeea0
commit 2f0d6c7e1e
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
jspsych.js
View File

@ -125,14 +125,23 @@
data: [], data: [],
next: function() { next: function() {
// call on_trial_finish()
// if not very first trial
// and
if(typeof this.trials[this.trial_idx+1] != "undefined" && (curr_block !=0 || this.trial_idx > -1)) { opts.on_trial_finish() };
this.trial_idx = this.trial_idx+1; this.trial_idx = this.trial_idx+1;
var curr_trial = trial_list[this.trial_idx]; var curr_trial = this.trials[this.trial_idx];
if ( typeof curr_trial == "undefined"){ if ( typeof curr_trial == "undefined"){
return this.done(); return this.done();
} }
// call on_trial_start()
opts.on_trial_start();
do_trial(this, curr_trial); do_trial(this, curr_trial);
}, },
@ -151,14 +160,8 @@
function do_trial(block, trial) function do_trial(block, trial)
{ {
// call on_trial_start()
opts.on_trial_start();
// execute trial method // execute trial method
jsPsych[trial.type]["trial"].call(this, DOM_target, block, trial, 1); jsPsych[trial.type]["trial"].call(this, DOM_target, block, trial, 1);
// call on_trial_finish()
opts.on_trial_finish();
} }
return core; return core;