Commit Graph

2634 Commits

Author SHA1 Message Date
bjoluc
37b85f953c
Setup changesets (#2066)
* Setup changesets and the changesets GH action
* Lower package versions so changesets can bump them
* Add changesets for all changes on the `modularization` branch

Co-authored-by: Josh de Leeuw <josh.deleeuw@gmail.com>
Co-authored-by: Becky Gilbert <beckyannegilbert@gmail.com>
2021-09-30 21:39:25 +02:00
bjoluc
2acc8880c5
Merge pull request #2133 from jspsych/modularization-plugin-param-type-changes
RDK and visual-search-circle plugins: parameter type changes - fixes #2132, #2139
2021-09-30 20:56:50 +02:00
bjoluc
03ebca411b
Merge branch 'modularization' into modularization-plugin-param-type-changes 2021-09-30 20:55:40 +02:00
bjoluc
ada7df432c
Merge branch 'main' into modularization 2021-09-30 18:20:13 +02:00
Josh de Leeuw
9a8a582d05 add .vscode to gitignore 2021-09-30 10:12:03 -04:00
Becky Gilbert
06bf0df926 remove all rdk-related files and references in docs (moved to jspsych-contrib, changes discussed here will be copied to that version) 2021-09-30 01:45:55 +02:00
Becky Gilbert
0c5f398cdc remove rdk files (moved to jspsych-contrib and changes will be copied there) 2021-09-30 01:42:01 +02:00
Josh de Leeuw
a913b62ead remove the plugins that moved to contrib 2021-09-29 12:06:59 -04:00
bjoluc
ff2827d8c9 Move test utility functions into @jspsych/test-utils 2021-09-28 20:04:19 +02:00
bjoluc
60ae24a932 Enable usage of test utils in external packages 2021-09-28 10:15:36 +02:00
bjoluc
09b61d40d1 Simplify root tsconfig.json 2021-09-28 09:05:49 +02:00
Becky Gilbert
3fa9d62fc7 fix incorrect trial type (video => video-keyboard-response) for v6.3.1 docs 2021-09-27 16:10:22 -07:00
Becky Gilbert
17d486905a fix incorrect webgazer.js link for v6.3.1 docs 2021-09-27 16:02:59 -07:00
Becky Gilbert
8c5cfb7d06 fix more instances of "class" that should be "style" - thanks @alisdt (#2165) 2021-09-23 10:50:32 -07:00
Becky Gilbert
41df53bc5f
Merge pull request #2165 from alisdt/alisdt-patch-1
fix error in rt-task tutorial code: "class" => "style"
2021-09-22 09:38:45 -07:00
alisdt
f1006ccf73
minor bug in example code
class='float: right;' should be style='float: right;'
2021-09-22 11:41:05 +01:00
Becky Gilbert
0d6e7074f2 add stimuli parameter option, foil parameter must be string (not array), foil is now always repeated up to set_size or set_size - 1 (depending on target_present value) 2021-09-17 22:39:09 +02:00
Becky Gilbert
f0739c53da fix correct_choice param in RDK tests 2021-09-17 22:33:08 +02:00
Becky Gilbert
4a171c7acd change visual-search-circle foil parameter to only allow an array of image path strings (not a single string) 2021-09-17 22:33:08 +02:00
Becky Gilbert
d731518112 change RDK correct_choice parameter to only allow array of strings (not a single string) 2021-09-17 22:32:41 +02:00
bjoluc
2319a9a211 Fix createCoreDistArchive gulp task on windows 2021-09-17 15:44:13 +02:00
Josh de Leeuw
0cf78c444b
Merge pull request #2099 from jspsych/modularization-es6-stuff
Modernizing core codebase
2021-09-15 09:28:36 -04:00
bjoluc
5ef21c5247 Fix callback invocations in MediaAPI tests 2021-09-15 12:12:04 +02:00
bjoluc
cb65c67935 Substitute remaining occurences of the flatten function 2021-09-15 12:03:48 +02:00
bjoluc
338c1b62b6 Merge branch 'modularization' into modularization-es6-stuff 2021-09-15 11:53:19 +02:00
bjoluc
9d8e39aaae Modernize factorial function 2021-09-15 11:23:26 +02:00
bjoluc
e720b4ebb1 Add standalone babel dependencies to @jspsych/config
They are used by non-typescript plugins in jspsych-contrib
2021-09-14 22:29:32 +02:00
bjoluc
7073cfb245 Add explicit baseUrl option to tsconfigs 2021-09-14 21:31:44 +02:00
bjoluc
ed87f4086d Skip explicit type checking in build workflow
to speed up builds. It's safe to do since the rollup builds check types
already.
2021-09-14 20:51:23 +02:00
bjoluc
6a8596fb76 Merge branch 'main' into modularization 2021-09-14 20:36:05 +02:00
bjoluc
63acb56dac Re-enable tests that depend on plugins converted in #2078 2021-09-14 18:31:48 +02:00
Josh de Leeuw
7fa8f26325
Change event types for require_movement parameter in slider response plugins (#2143)
* change event types for slider response (#1773)
2021-09-10 15:05:28 -04:00
Josh de Leeuw
12d675320f
Allow on_finish to return a Promise and delay the endExperiment message. (#2142)
* implement Promise handling for on_finish() experiment event. #2050 #1850

* add documentation
2021-09-10 13:40:56 -04:00
Josh de Leeuw
f37f64ac61
Rounds all duration measurements to the nearest INT (#2129)
Rounds all duration measurements to the nearest INT
2021-09-10 09:55:35 -04:00
Josh de Leeuw
2802430999
Generalize the on_load event so that plugins with async loads can trigger event (#2130)
Create optional `on_load: () => void` callback from `trial()` method and implement early-stage promise handling on timeline.
2021-09-09 14:40:06 -04:00
Becky Gilbert
db754538b7
Convert plugins to classes and update examples (#2078)
* 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>
2021-09-08 09:44:53 -04:00
Becky Gilbert
1c059608f3 remove repetitions_per_point parameter - fixes #2131 2021-09-07 10:37:07 -07:00
Josh de Leeuw
ddc3436b2f add test case for #2105 2021-09-01 15:26:40 -04:00
Josh de Leeuw
f4d04e5056
Merge pull request #2098 from bjoluc/preloading
Rework preloading in MediaAPI
2021-09-01 15:04:32 -04:00
Josh de Leeuw
a66d29c31f
Merge pull request #2087 from bjoluc/refactor-keyboard-listener-api
Refactor KeyboardListenerAPI
2021-09-01 14:59:26 -04:00
Josh de Leeuw
03517a09c8
Merge pull request #2121 from jspsych/modularization-turk-module-fix
Update turk module for modularization
2021-09-01 13:24:40 -04:00
Josh de Leeuw
898a38d3a7 TS-ify turk module, incorporate #1563 fix 2021-09-01 13:19:12 -04:00
Josh de Leeuw
213fffc516
Merge pull request #2106 from jspsych/docs-demos
Add live demos to the documentation
2021-08-31 10:22:14 -04:00
Josh de Leeuw
fc91efdd88
Merge pull request #2115 from jspsych/docs-data-saving-fixes
Fixing data saving documentation for 6.3 permadocs
2021-08-31 10:20:58 -04:00
Josh de Leeuw
3bbfaa45b6 a minimal fix for #1908 2021-08-30 14:02:09 -04:00
Josh de Leeuw
5e6c5d2352 expand reconstruction demo, make rdk demo only open in new tab 2021-08-30 13:04:14 -04:00
Josh de Leeuw
bfaad26520 add virtual chinrest demo 2021-08-30 12:46:38 -04:00
Josh de Leeuw
8afcce533f fix broken links 2021-08-30 11:19:38 -04:00
Josh de Leeuw
8da02641c1 add preload demos 2021-08-30 11:13:46 -04:00
Josh de Leeuw
5b7ca0c236 fix broken links 2021-08-30 10:10:31 -04:00