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>
96 lines
2.5 KiB
HTML
96 lines
2.5 KiB
HTML
<!DOCTYPE html>
|
|
<html>
|
|
<head>
|
|
<script src="../packages/jspsych/dist/index.browser.js"></script>
|
|
<script src="../packages/plugin-serial-reaction-time-mouse/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 grid_rows = 8;
|
|
var grid_cols = 8;
|
|
var square_size = 50;
|
|
|
|
var grid = [];
|
|
var locations = [];
|
|
|
|
for(var i=0; i<grid_rows; i++){
|
|
grid.push([]);
|
|
for(var j=0; j<grid_cols; j++){
|
|
grid[i].push(1);
|
|
if(i>0 && i < grid_rows-1 && j > 0 && j < grid_cols - 1){
|
|
locations.push([i,j]);
|
|
}
|
|
}
|
|
}
|
|
|
|
var last_predictor = null;
|
|
var last_target = null;
|
|
var colors = ["#f3c300", "#875692", "#f38400", "#a1caf1", "#be0032", "#c2b280", "#848482", "#008856"];
|
|
var deltas = [[-1,-1], [-1, 0], [-1, 1], [0, -1], [0, 1], [1, -1], [1,0], [1,1]];
|
|
var order = [0,1,2,3,4,5,6,7];
|
|
order = jsPsych.randomization.shuffle(order);
|
|
var current_idx = -1;
|
|
|
|
function getNextPredictor(){
|
|
current_idx++;
|
|
if(current_idx >= order.length){
|
|
order = jsPsych.randomization.shuffle(order);
|
|
current_idx = 0;
|
|
}
|
|
var predictor = jsPsych.randomization.sampleWithoutReplacement(locations, 1)[0];
|
|
if(last_target !== null){
|
|
while(predictor[0] == last_target[0] && predictor[1] == last_target[1]){
|
|
predictor = jsPsych.randomization.sampleWithoutReplacement(locations, 1)[0];
|
|
}
|
|
}
|
|
last_predictor = predictor;
|
|
return predictor;
|
|
}
|
|
|
|
function getNextTarget(){
|
|
var target = last_predictor.slice();
|
|
var d = deltas[order[current_idx]];
|
|
target[0] = target[0] + d[0];
|
|
target[1] = target[1] + d[1];
|
|
last_target = target;
|
|
return target;
|
|
}
|
|
|
|
function getColor(){
|
|
return colors[order[current_idx]];
|
|
}
|
|
|
|
var timeline_2 = {
|
|
timeline: [
|
|
{
|
|
type: jsPsychSerialReactionTimeMouse,
|
|
grid: grid,
|
|
target: getNextPredictor,
|
|
target_color: getColor,
|
|
grid_square_size: square_size,
|
|
allow_nontarget_responses: true
|
|
},
|
|
{
|
|
type: jsPsychSerialReactionTimeMouse,
|
|
grid: grid,
|
|
target: getNextTarget,
|
|
target_color: getColor,
|
|
grid_square_size: square_size
|
|
}
|
|
],
|
|
repetitions: 6,
|
|
};
|
|
|
|
jsPsych.run([timeline_2]);
|
|
|
|
</script>
|
|
</html>
|