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>
112 lines
3.2 KiB
HTML
112 lines
3.2 KiB
HTML
<!DOCTYPE html>
|
|
<html>
|
|
<head>
|
|
<script src="../packages/jspsych/dist/index.browser.js"></script>
|
|
<script src="../packages/plugin-free-sort/dist/index.browser.js"></script>
|
|
<script src="../packages/plugin-canvas-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();
|
|
}
|
|
});
|
|
|
|
var preload = {
|
|
type: jsPsychPreload,
|
|
auto_preload: true
|
|
};
|
|
|
|
var trial_1 = {
|
|
type: jsPsychFreeSort,
|
|
stimuli: ['img/happy_face_1.jpg','img/happy_face_3.jpg','img/sad_face_2.jpg','img/sad_face_4.jpg'],
|
|
stim_height: 120,
|
|
stim_width: 160,
|
|
sort_area_height: 500,
|
|
sort_area_width: 500,
|
|
prompt: 'Please group similar expressions together. ',
|
|
column_spread_factor: .5
|
|
};
|
|
|
|
var trial_2 = {
|
|
type: jsPsychFreeSort,
|
|
stimuli: ['img/happy_face_1.jpg','img/happy_face_3.jpg','img/sad_face_2.jpg','img/sad_face_4.jpg'],
|
|
stim_height: 120,
|
|
stim_width: 160,
|
|
prompt: '<p>Arrange the faces.</p>',
|
|
prompt_location: "below",
|
|
sort_area_height: 400,
|
|
sort_area_width: 500,
|
|
sort_area_shape: "square",
|
|
scale_factor: 1.2,
|
|
border_color_in: '#DCDCDC',
|
|
border_color_out: 'red'
|
|
};
|
|
|
|
var trial_3 = {
|
|
type: jsPsychCanvasKeyboardResponse,
|
|
stimulus: function(c) {
|
|
c.style.border = "5px solid #A9A9A9";
|
|
// present images on a canvas at specific locations
|
|
var ctx = c.getContext('2d');
|
|
var img1 = new Image();
|
|
var img2 = new Image();
|
|
var img3 = new Image();
|
|
img1.src = 'img/1.gif';
|
|
img2.src = 'img/2.gif';
|
|
img3.src = 'img/3.gif';
|
|
img1.addEventListener('load', function() {
|
|
ctx.drawImage(img1, 0, 0, 90, 90);
|
|
}, false);
|
|
img2.addEventListener('load', function() {
|
|
ctx.drawImage(img2, 400, 400, 90, 90);
|
|
}, false);
|
|
img3.addEventListener('load', function() {
|
|
ctx.drawImage(img3, 300, 100, 90, 90);
|
|
}, false);
|
|
},
|
|
canvas_size: [500,500],
|
|
prompt: "Memorize the image locations (5s).",
|
|
choices: "NO_KEYS",
|
|
trial_duration: 5000
|
|
};
|
|
|
|
var trial_4 = {
|
|
type: jsPsychFreeSort,
|
|
stimuli: ['img/1.gif','img/2.gif','img/3.gif'],
|
|
stim_height: 90,
|
|
stim_width: 90,
|
|
scale_factor: 1.0,
|
|
prompt: '<p>Where were the images?</p>',
|
|
prompt_location: 'below',
|
|
sort_area_shape: "square",
|
|
sort_area_height: 500,
|
|
sort_area_width: 500,
|
|
change_border_background_color: false,
|
|
border_width: 5,
|
|
counter_text_unfinished: "Not done yet...",
|
|
counter_text_finished: "Done!",
|
|
column_spread_factor: .5
|
|
};
|
|
|
|
var trial_5 = {
|
|
type: jsPsychFreeSort,
|
|
stimuli: ['img/4.gif','img/5.gif','img/6.gif'],
|
|
prompt: '<p>Arrange the images.</p><p>Images start at random locations inside the sort area.</p>',
|
|
change_border_background_color: false,
|
|
border_width: 3,
|
|
counter_text_unfinished: "",
|
|
counter_text_finished: "",
|
|
stim_starts_inside: true,
|
|
sort_area_shape: "square"
|
|
};
|
|
|
|
jsPsych.run([preload, trial_1, trial_2, trial_3, trial_4, trial_5]);
|
|
|
|
</script>
|
|
</html>
|