mirror of
https://github.com/jspsych/jsPsych.git
synced 2025-05-10 11:10: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>
116 lines
3.7 KiB
HTML
116 lines
3.7 KiB
HTML
<!DOCTYPE html>
|
|
<html>
|
|
<head>
|
|
<title>My experiment</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();
|
|
}
|
|
});
|
|
|
|
/* create timeline */
|
|
var timeline = [];
|
|
|
|
/* preload images */
|
|
var preload = {
|
|
type: jsPsychPreload,
|
|
images: ['img/blue.png', 'img/orange.png']
|
|
};
|
|
timeline.push(preload);
|
|
|
|
/* define welcome message trial */
|
|
var welcome = {
|
|
type: jsPsychHtmlKeyboardResponse,
|
|
stimulus: "Welcome to the experiment. Press any key to begin."
|
|
};
|
|
timeline.push(welcome);
|
|
|
|
/* define instructions trial */
|
|
var instructions = {
|
|
type: jsPsychHtmlKeyboardResponse,
|
|
stimulus: `
|
|
<p>In this experiment, a circle will appear in the center
|
|
of the screen.</p><p>If the circle is <strong>blue</strong>,
|
|
press the letter F on the keyboard as fast as you can.</p>
|
|
<p>If the circle is <strong>orange</strong>, press the letter J
|
|
as fast as you can.</p>
|
|
<div style='width: 700px;'>
|
|
<div style='float: left;'><img src='img/blue.png'></img>
|
|
<p class='small'><strong>Press the F key</strong></p></div>
|
|
<div class='float: right;'><img src='img/orange.png'></img>
|
|
<p class='small'><strong>Press the J key</strong></p></div>
|
|
</div>
|
|
<p>Press any key to begin.</p>
|
|
`,
|
|
post_trial_gap: 2000
|
|
};
|
|
timeline.push(instructions);
|
|
|
|
/* test trials */
|
|
var test_stimuli = [
|
|
{ stimulus: "img/blue.png", correct_response: 'f' },
|
|
{ stimulus: "img/orange.png", correct_response: 'j' }
|
|
];
|
|
|
|
var fixation = {
|
|
type: jsPsychHtmlKeyboardResponse,
|
|
stimulus: '<div style="font-size:60px;">+</div>',
|
|
choices: "NO_KEYS",
|
|
trial_duration: function () {
|
|
return jsPsych.randomization.sampleWithoutReplacement([250, 500, 750, 1000, 1250, 1500, 1750, 2000], 1)[0];
|
|
},
|
|
data: {
|
|
task: 'fixation'
|
|
}
|
|
};
|
|
|
|
var test = {
|
|
type: jsPsychImageKeyboardResponse,
|
|
stimulus: jsPsych.timelineVariable('stimulus'),
|
|
choices: ['f', 'j'],
|
|
data: {
|
|
task: 'response',
|
|
correct_response: jsPsych.timelineVariable('correct_response')
|
|
},
|
|
on_finish: function (data) {
|
|
data.correct = jsPsych.pluginAPI.compareKeys(data.response, data.correct_response);
|
|
}
|
|
};
|
|
|
|
var test_procedure = {
|
|
timeline: [fixation, test],
|
|
timeline_variables: test_stimuli,
|
|
repetitions: 5,
|
|
randomize_order: true
|
|
};
|
|
timeline.push(test_procedure);
|
|
|
|
/* define debrief */
|
|
var debrief_block = {
|
|
type: jsPsychHtmlKeyboardResponse,
|
|
stimulus: function () {
|
|
var trials = jsPsych.data.get().filter({ task: 'response' });
|
|
var correct_trials = trials.filter({ correct: true });
|
|
var accuracy = Math.round(correct_trials.count() / trials.count() * 100);
|
|
var rt = Math.round(correct_trials.select('rt').mean());
|
|
return `<p>You responded correctly on ${accuracy}% of the trials.</p>
|
|
<p>Your average response time was ${rt}ms.</p>
|
|
<p>Press any key to complete the experiment. Thank you!</p>`;
|
|
}
|
|
};
|
|
timeline.push(debrief_block);
|
|
|
|
/* start the experiment */
|
|
jsPsych.run(timeline);
|
|
|
|
</script>
|
|
</html> |