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

bug fixes for callback methods in previous commit

Browse Source
This commit is contained in:
Josh de Leeuw 2012-07-17 18:13:52 -04:00
parent 19983090a8
commit 946f1aeea0
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jspsych.js
View File

@ -25,10 +25,6 @@
var initialized = false; var initialized = false;
// target DOM element // target DOM element
var DOM_target; var DOM_target;
// trial start callback method
var on_trial_start;
// trial finish callback method
var on_trial_finish;
// //
// public methods // public methods
@ -36,7 +32,7 @@
core.init = function($this, options){ core.init = function($this, options){
var defaults = { var defaults = {
'on_trial_start': function(){ return undefined; } 'on_trial_start': function(){ return undefined; },
'on_trial_finish': function() { return undefined; } 'on_trial_finish': function() { return undefined; }
} }
// import options // import options
@ -142,7 +138,7 @@
done: nextBlock, done: nextBlock,
num_trials: trials_list.length num_trials: trial_list.length
} }
return block; return block;
@ -156,13 +152,13 @@
function do_trial(block, trial) function do_trial(block, trial)
{ {
// call on_trial_start() // call on_trial_start()
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() // call on_trial_finish()
on_trial_finish(); opts.on_trial_finish();
} }
return core; return core;