mirror of
https://github.com/jspsych/jsPsych.git
synced 2025-05-10 03:00:54 +00:00
db754538b7
* modularize plugins: edit index.ts and example files (WIP)
* continue modularizing plugins: edit index.ts and example files (WIP)
* continue modularizing plugins: edit index.ts and example files (WIP)
* continue modularizing plugins and example files, make info static in plugin classes
* add preload flag to plugin info, fix a few parameterType values
* change preload flags in plugin info from audio/image/video strings to boolean
* convert more plugins and example files
* convert more plugins/examples, sync with webgazer branch plugins/examples (not working on this branch)
* remove preload flag from info, change to ParameterType, change to "ALL_KEYS"/"NO_KEYS", change KEY type to KEYS for array params
* remove descriptions from plugin info, fix some ALL_KEYS/NO_KEYS errors
* remove descriptions and add pretty names to plugin info
* remove/edit comments re ALL_KEYS/NO_KEYS and TS errors
* fix some preload plugin errors and convert example file (plugin still not working due to getAutoPreloadList)
* convert RDK plugin and example file
* convert preload plugin and example, add JsPsych getTimelineDescription method for auto-preloading (still not working for audio due to getAudioBuffer
* fix jsPsych getTimelineDescription method so that it does recursive search
* add image and video preloading to plugin examples
* Merge branch 'modularization' into modularization-plugins
* add tests for reconstruction
* fix timeline array getter method: add private timelineDescription var, set to timeline array in run(), rename getTimelineDescription to getTimeline
* changes in response to PR review: fix JsDoc comments, fix array: true in param info, change HTML string param types, add JsDoc author/file/see docs for all plugin classes, switch to @ts-expect-error. Thanks @bjoluc!
* fix JsDoc comments for plugin classes and preload trials parameter
* change preload type to boolean in ParameterInfo interface, and add `preload: false` to virtual-chinrest item_path image parameter
* All my tests except for preload plugin (will do that tomorrow)
* minor fixes to reconstruction tests
* Update preload plugin tests
* Finish test conversion
* switch to arrow functions to fix this keyword errors in plugins, add audio preloading into plugin example files, fix typos
* convert non-plugin example files (WIP, not tested)
* Fix allow_held_keys -> allow_held_key parameter in virtual-chinrest plugin
* Fix `keyboardListener` type in serial-reaction-time plugin
* type fixes for RDK, simplifying `correctOrNot()` function
* fixed ["ALL_KEYS"] => "ALL_KEYS" for iat plugins and tests
* Build jspsych packages before everything else
Dependent builds were previously failing due to missing type definitions
* Remove console.log from html-keyboard-response tests
I think I accidentially committed it.
* fix the delayed start to animation bug (#1885)
* round all RTs to nearest int (#2108)
* fixes and tests #1900 - IAT parameter problems
* finish converting/testing example files, add init settings, add audio preloading, fix errors
* fix progress-bar timeline to demo an example where auto-updating the progress bar works well
* Revert "round all RTs to nearest int (#2108)"
This reverts commit f53145d2e3.
* change how delayed timeline variables are implemented
* use static for generate_stimulus method so that it can be called on the vsl-grid-scene class
* fix external-html plugin and example (switch to arrow function for proper this context, fix incorrect parameter name)
* remove outdated TO DO comments
Co-authored-by: bjoluc <mail@bjoluc.de>
Co-authored-by: Josh de Leeuw <josh.deleeuw@gmail.com>
120 lines
4.2 KiB
HTML
120 lines
4.2 KiB
HTML
<!DOCTYPE html>
|
|
<html>
|
|
<head>
|
|
<title>Flanker Task</title>
|
|
<script src="../packages/jspsych/dist/index.browser.js"></script>
|
|
<script src="../packages/plugin-html-keyboard-response/dist/index.browser.js"></script>
|
|
<script src="../packages/plugin-image-keyboard-response/dist/index.browser.js"></script>
|
|
<script src="../packages/plugin-preload/dist/index.browser.js"></script>
|
|
<link rel="stylesheet" href="../packages/jspsych/css/jspsych.css">
|
|
</head>
|
|
<body></body>
|
|
<script>
|
|
|
|
var jsPsych = initJsPsych({
|
|
on_finish: function() {
|
|
jsPsych.data.displayData();
|
|
}
|
|
});
|
|
|
|
/* experiment parameters */
|
|
var reps_per_trial_type = 4;
|
|
|
|
/*set up welcome block*/
|
|
var welcome = {
|
|
type: jsPsychHtmlKeyboardResponse,
|
|
stimulus: "Welcome to the experiment. Press any key to begin."
|
|
};
|
|
|
|
/*set up instructions block*/
|
|
var instructions = {
|
|
type: jsPsychHtmlKeyboardResponse,
|
|
stimulus: "<p>In this task, you will see five arrows on the screen, like the example below.</p>"+
|
|
"<img src='img/inc1.png'></img>"+
|
|
"<p>Press the left arrow key if the middle arrow is pointing left. (<)</p>"+
|
|
"<p>Press the right arrow key if the middle arrow is pointing right. (>)</p>"+
|
|
"<p>Press any key to begin.</p>",
|
|
post_trial_gap: 1000
|
|
};
|
|
|
|
/*defining stimuli*/
|
|
var test_stimuli = [
|
|
{
|
|
stimulus: "img/con1.png",
|
|
data: { stim_type: 'congruent', direction: 'left'}
|
|
},
|
|
{
|
|
stimulus: "img/con2.png",
|
|
data: { stim_type: 'congruent', direction: 'right'}
|
|
},
|
|
{
|
|
stimulus: "img/inc1.png",
|
|
data: { stim_type: 'incongruent', direction: 'right'}
|
|
},
|
|
{
|
|
stimulus: "img/inc2.png",
|
|
data: { stim_type: 'incongruent', direction: 'left'}
|
|
}
|
|
];
|
|
|
|
/* defining test timeline */
|
|
var test = {
|
|
timeline: [{
|
|
type: jsPsychImageKeyboardResponse,
|
|
choices: ['ArrowLeft', 'ArrowRight'],
|
|
trial_duration: 1500,
|
|
stimulus: jsPsych.timelineVariable('stimulus'),
|
|
data: jsPsych.timelineVariable('data'),
|
|
on_finish: function(data) {
|
|
var correct = false;
|
|
if (data.direction == 'left' && jsPsych.pluginAPI.compareKeys(data.response, 'ArrowLeft') && data.rt > -1) {
|
|
correct = true;
|
|
} else if (data.direction == 'right' && jsPsych.pluginAPI.compareKeys(data.response, 'ArrowRight') && data.rt > -1) {
|
|
correct = true;
|
|
}
|
|
data.correct = correct;
|
|
},
|
|
post_trial_gap: function() {
|
|
return Math.floor(Math.random() * 1500) + 500;
|
|
}
|
|
}],
|
|
timeline_variables: test_stimuli,
|
|
sample: {type: 'fixed-repetitions', size: reps_per_trial_type}
|
|
};
|
|
|
|
/*defining debriefing block*/
|
|
var debrief = {
|
|
type: jsPsychHtmlKeyboardResponse,
|
|
stimulus: function() {
|
|
var total_trials = jsPsych.data.get().filter({trial_type: 'image-keyboard-response'}).count();
|
|
var accuracy = Math.round(jsPsych.data.get().filter({correct: true}).count() / total_trials * 100);
|
|
var congruent_rt = Math.round(jsPsych.data.get().filter({correct: true, stim_type: 'congruent'}).select('rt').mean());
|
|
var incongruent_rt = Math.round(jsPsych.data.get().filter({correct: true, stim_type: 'incongruent'}).select('rt').mean());
|
|
return "<p>You responded correctly on <strong>"+accuracy+"%</strong> of the trials.</p> " +
|
|
"<p>Your average response time for congruent trials was <strong>" + congruent_rt + "ms</strong>.</p>"+
|
|
"<p>Your average response time for incongruent trials was <strong>" + incongruent_rt + "ms</strong>.</p>"+
|
|
"<p>Press any key to complete the experiment. Thank you!</p>";
|
|
}
|
|
};
|
|
|
|
// manually preload images due to presenting them with timeline variables
|
|
var images = ["img/con1.png","img/con2.png","img/inc1.png","img/inc2.png"];
|
|
var preload = {
|
|
type: jsPsychPreload,
|
|
images: images
|
|
};
|
|
|
|
/*set up experiment structure*/
|
|
var timeline = [];
|
|
timeline.push(preload);
|
|
timeline.push(welcome);
|
|
timeline.push(instructions);
|
|
timeline.push(test);
|
|
timeline.push(debrief);
|
|
|
|
/*start experiment*/
|
|
jsPsych.run(timeline);
|
|
|
|
</script>
|
|
</html>
|