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

change repetitions -> sequence_reps

Browse Source 
prevents conflict with new default repetitions option
This commit is contained in:
Josh de Leeuw 2014-10-15 17:31:30 -04:00
parent 9d816dbf2b
commit b5fc742461
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/jspsych-animation.js
View File

@ -20,7 +20,7 @@
trials[i].stims = params.stimuli[i]; trials[i].stims = params.stimuli[i];
trials[i].frame_time = params.frame_time || 250; trials[i].frame_time = params.frame_time || 250;
trials[i].frame_isi = params.frame_isi || 0; trials[i].frame_isi = params.frame_isi || 0;
trials[i].repetitions = params.repetitions || 1; trials[i].sequence_reps = params.sequence_reps || 1;
trials[i].choices = params.choices || []; trials[i].choices = params.choices || [];
trials[i].prompt = (typeof params.prompt === 'undefined') ? "" : params.prompt; trials[i].prompt = (typeof params.prompt === 'undefined') ? "" : params.prompt;
} }
@ -49,7 +49,7 @@
if (animate_frame == trial.stims.length) { if (animate_frame == trial.stims.length) {
animate_frame = 0; animate_frame = 0;
reps++; reps++;
if (reps >= trial.repetitions) { if (reps >= trial.sequence_reps) {
endTrial(); endTrial();
clearInterval(animate_interval); clearInterval(animate_interval);
showImage = false; showImage = false;