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

quick bug fixes

Browse Source
This commit is contained in:
Josh de Leeuw 2016-05-18 17:29:03 -04:00
parent 01b78b54b9
commit 88ea761973
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jspsych.js
View File

@ -134,13 +134,13 @@ var jsPsych = (function() {
// wait for iti // wait for iti
if (typeof current_trial.timing_post_trial == 'undefined') { if (typeof current_trial.timing_post_trial == 'undefined') {
if (opts.default_iti > 0) { if (opts.default_iti > 0) {
setTimeout(next_trial, opts.default_iti); setTimeout(nextTrial, opts.default_iti);
} else { } else {
nextTrial(); nextTrial();
} }
} else { } else {
if (current_trial.timing_post_trial > 0) { if (current_trial.timing_post_trial > 0) {
setTimeout(next_trial, current_trial.timing_post_trial); setTimeout(nextTrial, current_trial.timing_post_trial);
} else { } else {
nextTrial(); nextTrial();
} }
@ -175,7 +175,7 @@ var jsPsych = (function() {
core.addNodeToEndOfTimeline = function(new_timeline, preload_callback){ core.addNodeToEndOfTimeline = function(new_timeline, preload_callback){
timeline.insert(new_timeline); timeline.insert(new_timeline);
if(opts.auto_preload){ if(opts.auto_preload){
jsPsych.pluginAPI.autoPreload(new_timeline, preload_callback); jsPsych.pluginAPI.autoPreload(timeline, preload_callback);
} else { } else {
preload_callback(); preload_callback();
} }