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

conditional_function only runs with first set of variables #585

Browse Source
This commit is contained in:
Josh de Leeuw 2021-02-04 21:50:23 -05:00
parent e0ee7f02e2
commit 8dd61e6bed
2 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jspsych.js
View File

@ -489,8 +489,8 @@ window.jsPsych = (function() {
// check for on_timeline_start and conditonal function on nodes with timelines
if (typeof timeline_parameters != 'undefined') {
// only run the conditional function if this is the first repetition of the timeline when
// repetitions > 1
if (typeof timeline_parameters.conditional_function !== 'undefined' && progress.current_repetition==0) {
// repetitions > 1, and only when on the first variable set
if (typeof timeline_parameters.conditional_function !== 'undefined' && progress.current_repetition==0 && progress.current_variable_set == 0) {
var conditional_result = timeline_parameters.conditional_function();
// if the conditional_function() returns false, then the timeline
// doesn't run and is marked as complete.

35
tests/jsPsych/timelines.test.js
View File

@ -301,6 +301,41 @@ describe('conditional function', function(){
expect(conditional_count).toBe(1);
})
test('executes only once when timeline variables are used', function(){
var conditional_count = 0;
var trial = {
timeline: [{
type: 'html-keyboard-response',
stimulus: 'foo'
}],
timeline_variables: [
{a:1},
{a:2}
],
conditional_function: function(){
conditional_count++;
return true;
}
}
jsPsych.init({
timeline: [trial]
});
expect(conditional_count).toBe(1);
// first trial
utils.pressKey(32);
expect(conditional_count).toBe(1);
// second trial
utils.pressKey(32);
expect(conditional_count).toBe(1);
})
test('timeline variables from nested timelines are available', function(){
var trial = {
type: 'html-keyboard-response',