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

fix function as stimuli parameter issue

Browse Source 
issue #109
This commit is contained in:
Josh de Leeuw 2015-01-29 19:57:07 -05:00
parent f83aa5a20c
commit 3eba68c20e
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/jspsych-same-different.js
View File

@ -19,8 +19,7 @@
var trials = new Array(params.stimuli.length);
for (var i = 0; i < trials.length; i++) {
trials[i] = {};
trials[i].a_path = params.stimuli[i][0];
trials[i].b_path = params.stimuli[i][1];
trials[i].stimuli = params.stimuli[i];
trials[i].answer = params.answer[i];
trials[i].same_key = params.same_key || 81; // default is 'q'
trials[i].different_key = params.different_key || 80; // default is 'p'
@ -41,7 +40,11 @@
// this evaluates the function and replaces
// it with the output of the function
trial = jsPsych.pluginAPI.normalizeTrialVariables(trial);
// unpack the stimuli array (for backwards code compatibility. this could be cleaned up in the future)
trial.a_path = trial.stimuli[0];
trial.b_path = trial.stimuli[1];
// this array holds handlers from setTimeout calls
// that need to be cleared if the trial ends early
var setTimeoutHandlers = [];