mirror of
https://github.com/jspsych/jsPsych.git
synced 2025-05-10 19:20:55 +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>
81 lines
2.6 KiB
HTML
81 lines
2.6 KiB
HTML
<!DOCTYPE html>
|
|
<html>
|
|
<head>
|
|
<script src="../packages/jspsych/dist/index.browser.js"></script>
|
|
<script src="../packages/plugin-canvas-keyboard-response/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();
|
|
}
|
|
});
|
|
|
|
// stimulus functions that take the canvas as its only argument
|
|
// these function names can be used as the value for the stimulus parameter
|
|
function drawRect(c){
|
|
var ctx = c.getContext('2d');
|
|
ctx.beginPath();
|
|
ctx.rect(150, 225, 200, 50);
|
|
ctx.stroke();
|
|
}
|
|
|
|
function drawCirc(c) {
|
|
var ctx = c.getContext('2d');
|
|
ctx.beginPath();
|
|
ctx.arc(250, 250, 200, 0, 2 * Math.PI);
|
|
ctx.stroke();
|
|
}
|
|
|
|
var trial_1 = {
|
|
type: jsPsychCanvasKeyboardResponse,
|
|
stimulus: drawRect,
|
|
choices: ['e','i'],
|
|
prompt: '<p>Is this a circle or a rectangle? Press "e" for circle and "i" for rectangle.</p>',
|
|
data: {shape: 'rectangle'}
|
|
};
|
|
|
|
var trial_2 = {
|
|
type: jsPsychCanvasKeyboardResponse,
|
|
stimulus: drawCirc,
|
|
choices: ['e','i'],
|
|
prompt: '<p>Is this a circle or a rectangle? Press "e" for circle and "i" for rectangle.</p>',
|
|
data: {shape: 'circle'}
|
|
};
|
|
|
|
// to use the canvas stimulus function with timeline variables,
|
|
// the jsPsych.timelineVariable() function can be used inside your stimulus function
|
|
var trial_procedure = {
|
|
timeline: [{
|
|
type: jsPsychCanvasKeyboardResponse,
|
|
stimulus: function(c) {
|
|
var ctx = c.getContext('2d');
|
|
ctx.beginPath();
|
|
ctx.fillStyle = jsPsych.timelineVariable('color');
|
|
ctx.fillRect(
|
|
jsPsych.timelineVariable('upper_left_x'),
|
|
jsPsych.timelineVariable('upper_left_y'),
|
|
jsPsych.timelineVariable('width'),
|
|
jsPsych.timelineVariable('height')
|
|
);
|
|
ctx.stroke();
|
|
},
|
|
choices: ['r','b'],
|
|
prompt: '<p>What color is the rectangle? Press "r" for red and "b" for blue.</p>',
|
|
data: {color: jsPsych.timelineVariable('color')}
|
|
}],
|
|
timeline_variables: [
|
|
{upper_left_x: 150, upper_left_y: 100, height: 100, width: 150, color: 'red'},
|
|
{upper_left_x: 270, upper_left_y: 200, height: 300, width: 200, color: 'blue'},
|
|
{upper_left_x: 150, upper_left_y: 130, height: 200, width: 50, color: 'blue'}
|
|
]
|
|
};
|
|
|
|
jsPsych.run([trial_1, trial_2, trial_procedure]);
|
|
|
|
</script>
|
|
</html>
|