jade
b420804203
consolidate resolveJsonModule rule into main tsconfig.json
2024-10-19 18:20:55 -04:00
jade
db7bcf82f6
let contrib repo import json files as modules
2024-09-22 19:02:07 -04:00
cchang-vassar
a2e7918773
fix browser tool for citations
2024-09-19 14:03:45 -04:00
cchang-vassar
bceacab4ca
i really hate this library
2024-09-16 14:01:20 -04:00
cchang-vassar
909cb9a768
fix build citation rollup plugin to actually generate citation
2024-09-13 09:45:27 -04:00
cchang-vassar
bab33ead69
fix: error handling chain in building citations
2024-09-12 16:24:12 -04:00
cchang-vassar
7963fdcf21
move additionalPlugin out of outputOptions
2024-09-12 13:59:18 -04:00
cchang-vassar
715ed2a6c2
pull bjorn fixes
2024-09-12 13:14:08 -04:00
cchang-vassar
e2039c43fa
pulling bjorn fixes
2024-09-12 13:08:52 -04:00
bjoluc
fd07de6800
Merge branch 'update-config-dependencies' into add-citation-module
2024-09-12 01:02:54 +02:00
bjoluc
7b3c11b79e
Bump alias-hq to version 6.2.4
2024-09-12 00:45:54 +02:00
bjoluc
3f3d68bd42
Update rollup and the rollup plugins, including esbuild
2024-09-12 00:42:52 +02:00
bjoluc
9e823bfcd7
Merge branch 'main' into update-config-dependencies
2024-09-11 21:52:26 +02:00
Josh de Leeuw
62d34278a3
This fixes build errors, but warnings are still present. Adds rollup/json plugin back into build chain.
2024-09-11 13:57:02 -04:00
Josh de Leeuw
7ca68ea38d
Merge branch 'main' into add-citation-module
2024-09-11 13:12:54 -04:00
Josh de Leeuw
59ce0b316b
very broken :(
2024-08-31 16:22:58 -04:00
cchang-vassar
bbd09e2ace
move citation rollup plugin to config folder
2024-08-27 13:43:12 -04:00
cchang-vassar
1c5f826fbe
add rollup plugin for building citation
2024-08-27 13:05:12 -04:00
joshunrau
67b4a05878
clean up randomWords signature
2024-08-27 12:50:00 -04:00
joshunrau
d824aa5e7a
improve randomization typing
2024-08-27 12:40:05 -04:00
cchang-vassar
47d57f03ed
delete braces from root package.json
2024-08-12 11:40:34 -04:00
github-actions[bot]
ee48a7eca7
chore(release): version packages
2024-08-08 15:10:26 +00:00
Josh de Leeuw
4b080ca4c5
Fix broken event handlers in sketchpad; change Array.from()
2024-08-08 11:04:05 -04:00
max-lovell
51ebc5449b
Array.from() -> Array.prototype.slice.call() in free sort and maxdiff plugins
2024-08-06 19:27:31 +01:00
Josh de Leeuw
ffef2611e6
upgrade to gulp 5.0
2024-08-06 11:29:57 -04:00
max-lovell
3906daad54
Replace Array.from() with spread operator
2024-08-05 12:10:25 +01:00
levigoldberg
923057049e
Change broken selection in enable_button_after parameter
...
The button class was not being selected correctly resulting in a broken enable_button_after parameter
2024-07-29 10:25:23 +02:00
github-actions[bot]
b126d1e12e
chore(release): version packages
2024-07-18 18:21:28 +00:00
Josh de Leeuw
9ea0592bfc
Merge pull request #3352 from vzhang03/v8
...
Added extension version and type to ExtensionManager.ts
2024-07-18 14:17:43 -04:00
Bankminer78
e94691cf6b
Updated tests
2024-07-18 12:22:13 -04:00
Bankminer78
6ab31019ff
Changed push to unshift to make extension version and type appear first
2024-07-18 12:11:17 -04:00
Bankminer78
81ed9ad3f8
Changed jsPsych and extensions to read version and name from class
2024-07-18 11:50:03 -04:00
github-actions[bot]
39215339c5
chore(release): version packages
2024-07-17 23:08:32 +00:00
Josh de Leeuw
e374226e32
Merge pull request #3348 from vzhang03/audio-player
...
Fixed negative rt bug in audio-button and audio-slider plugin.
2024-07-17 19:04:54 -04:00
Bankminer78
67b857fde6
Added extension version and type to record-video
2024-07-17 12:06:24 -04:00
Bankminer78
a84ca70ab1
Fixed negative rt bug by making recording startTime with AudioContext
2024-07-17 10:41:53 -04:00
github-actions[bot]
e2f7e91844
chore(release): version packages
2024-07-16 19:24:38 +00:00
Bankminer78
7db7095a63
Changed AudioPlayer to handle WebAudio API source nodes; added tests for enable_button_after for audio_button_response.
2024-07-16 11:29:04 -04:00
Josh de Leeuw
0ce8244c7d
remove type for now
2024-07-15 17:08:32 -04:00
Josh de Leeuw
dc3bf37b64
fix merge error, remove console logs
2024-07-15 17:01:27 -04:00
Josh de Leeuw
23b114eb8c
Merge branch 'v8' into audio-player
2024-07-15 16:53:54 -04:00
Bankminer78
f5e3aff082
Removed .only addition from test
2024-07-15 14:09:04 -04:00
Bankminer78
e2a9e6b33e
Changed AudioPlayer to implement interface; fixed build error; rewrote plugins using AudioPlayer and added tests; changed test-utils' clickTarget to respect disabled forms
2024-07-15 13:47:23 -04:00
Josh de Leeuw
76797940f5
Merge pull request #3339 from jspsych/feature-default-finish-timeline
...
Make `finishTrial` clear the display and remove timeouts
2024-07-12 08:32:10 -04:00
Josh de Leeuw
c0d1624e99
Merge branch 'v8' into v8-css-updates
2024-07-11 21:43:38 -04:00
Josh de Leeuw
d520b70fbf
remove now unnecessary timeout clears and display clears
2024-07-11 18:06:30 -04:00
Josh de Leeuw
313edc2af5
adjust tests to work with cleanup
2024-07-11 17:17:55 -04:00
Josh de Leeuw
06b082a977
remove unnecessary timeout clear and display clear
2024-07-11 16:25:39 -04:00
Josh de Leeuw
4b13ad64fd
adding trialCleanup method
2024-07-11 16:21:11 -04:00
Josh de Leeuw
43172ff0b7
Merge pull request #3326 from vzhang03/v8-plugin-metadata
...
Add additional information to plugin `info` to support better metadata collection
2024-07-11 14:04:26 -04:00
vzhang03
b690802ed6
Addressing last batch of PR comments
2024-07-11 11:29:20 -04:00
Josh de Leeuw
80cccfa39d
Merge pull request #3338 from jspsych/3325-fix
...
`getKeyboardResponse` will return `key` in original case
2024-07-11 10:26:36 -04:00
Josh de Leeuw
429520095f
Merge pull request #3242 from Shaobin-Jiang/fix-typo
...
Fix typo
2024-07-11 10:21:55 -04:00
Josh de Leeuw
f2da262f90
return e.key instead of case transformed key
2024-07-11 10:09:20 -04:00
Josh de Leeuw
5521cfc888
fix test case
2024-07-11 10:08:59 -04:00
Josh de Leeuw
2889e854a0
add test for getKeyboardResponse can return a lower case version of the key in some circumstances #3325
2024-07-11 10:05:41 -04:00
Bankminer78
59cc6138ac
Changed test for ExtensionManager to handle version and type
2024-07-09 12:34:47 -04:00
Bankminer78
1f6faf336c
Edited ExtensionManager.ts to handle multiple extension types and versions
2024-07-08 16:43:40 -04:00
Bankminer78
fadded2b4a
Added version and extension type for 2 of 3 extensions
2024-07-03 17:13:23 -04:00
vzhang03
95a2203e27
Updating extensions - missing documentation within extensions
2024-06-29 20:44:22 -04:00
vzhang03
bdf4fc3eee
Fixed test to use plugin_version
2024-06-25 12:56:27 -04:00
vzhang03
1542c219d3
Responded to comments in PR - editing changeset to be accurate, changing naming to be clear
2024-06-25 11:27:47 -04:00
vzhang03
b7bd08aaac
Fixed tests by adding version to ignored fields
2024-06-25 10:55:18 -04:00
vzhang03
b294640652
Fixed version number displaying and updated error messages to be more description
2024-06-25 10:28:02 -04:00
vzhang03
bd0e164de3
Made version/data optional with warnings, created field to write data to final collection
2024-06-25 10:14:30 -04:00
vzhang03
a5712c8d8f
Fixed error when documenting plugin
2024-06-21 16:11:27 -04:00
vzhang03
61e1544b9a
Updated final plugin test
2024-06-21 15:06:48 -04:00
vzhang03
593d4ce7bf
Updating old tests to use new plugin syntax and requirements
2024-06-21 15:03:10 -04:00
vzhang03
65ba0d9239
Finalized first round of metadata edits for all existing plugins
2024-06-21 12:12:47 -04:00
vzhang03
30125f15e5
Commented out parameters and included as floats, want to go over later
2024-06-21 11:16:37 -04:00
vzhang03
0dd9c2190b
Finished video plugins, inconsistencies with data collected between video slider and thinking about github issues - standardadizing the organization of comments and improving consistency
2024-06-21 10:31:25 -04:00
vzhang03
80fb904455
Finished formatting and removed pretty names for survey plugins, talk to Josh about representation of data
2024-06-20 16:23:26 -04:00
vzhang03
f26f0a747b
Finished survey and sketchpad, have questions about data for response whether it needs to be 'nested' vs 'parameters' or if the type definition for response is correct
2024-06-20 15:41:34 -04:00
vzhang03
f48216125a
Finished packages with questions about plugin-serial grids
2024-06-17 17:02:39 -04:00
vzhang03
eb40001e63
Questions about which description to use when the doc seems less complete than the jsDoc in the plugin (preload
2024-06-17 16:29:57 -04:00
vzhang03
7e7346caff
Pushing plugins with fixed formatting of comments
2024-06-17 14:48:26 -04:00
vzhang03
fbe642c50f
Continued work updating plugins
2024-06-17 12:15:29 -04:00
vzhang03
658cf16eb9
Updated documentation for browser-check through canvas-slider response
2024-06-17 10:58:59 -04:00
Josh de Leeuw
1fd3b6d439
Merge branch 'v8' into enhance-instructions
2024-06-15 14:01:10 -04:00
Josh de Leeuw
ec7e207c35
Merge pull request #3166 from jspsych/v8-remove-deprecated-features
...
Remove deprecated features for version 8
2024-06-14 17:50:31 -04:00
Josh de Leeuw
c3eb8e54c0
Merge pull request #3031 from jspsych/fix-datacolumn-mean-2905
...
Change `DataColumn.mean()` to ignore `null` and `undefined` values
2024-06-14 17:50:03 -04:00
vzhang03
222cf6c823
Updated audio-keyboard-response and audio-slider-response according to the new standards
2024-06-14 17:02:05 -04:00
vzhang03
485f1c406b
Fixing links and finished plugin-audio-response-button
2024-06-13 14:20:22 -04:00
vzhang03
5c0fabb630
Finished updating animation plugin for new standards
2024-06-13 13:49:23 -04:00
vzhang03
6a1d277cde
Completed example of updated plugin html-keyboard-response with various requirements fixing for docs and version numbers
2024-06-13 11:46:40 -04:00
vzhang03
46fc6b7e71
Merge remote-tracking branch 'upstream/v8' into v8-plugin-metadata
2024-06-13 11:03:12 -04:00
vzhang03
9e4947d99f
Finished up initial metadata example draft - to be reviewed
2024-06-13 10:56:28 -04:00
bjoluc
3b38855ec2
Merge remote-tracking branch 'origin/v8' into v8
2024-06-07 23:03:10 +02:00
Josh de Leeuw
a85999585a
Merge pull request #3300 from jspsych/changeset-release/main
...
Version Packages
(rebased-with-history from commit 7d41078e9d
2024-06-07 22:49:07 +02:00
Josh de Leeuw
e778028d0b
Merge pull request #3298 from thtTNT/main
...
Add parameter "enable_button_after" to all "-button-response" plugins
(rebased-with-history from commit 87d2a8e0ab
2024-06-07 22:49:07 +02:00
github-actions[bot]
f5f2aa3f46
chore(release): version packages ( #3294 )
...
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
(rebased-with-history from commit c2dd493f6e
2024-06-07 22:49:07 +02:00
Becky Gilbert
f0d36f4a79
fix incorrect path in dist gulp job (build:archive) ( #3293 )
...
* fix incorrect path in dist gulp job (build:archive)
* add changeset for config patch
(rebased-with-history from commit 7bcd4e0a25
2024-06-07 22:49:07 +02:00
github-actions[bot]
94e174d510
Version Packages ( #3292 )
...
* chore(release): version packages
* edit changelogs
---------
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Becky Gilbert <beckyannegilbert@gmail.com>
(rebased-with-history from commit e201ca29af
2024-06-07 22:49:07 +02:00
Becky Gilbert
ad03a8bffc
Survey plugin updates: fix CSS, clean up code/comments, add survey.css to dist archive ( #3287 )
...
* make applyStyles private and clean up comments
* fix box shadow in input elements
* fix dropdown element width
* remove old/unused plugin-survey.css file
* add survey.css to dist archive
* add changeset
(rebased-with-history from commit 54e04dc93f
2024-06-07 22:49:07 +02:00
Becky Gilbert
b97478ef2e
remove built dist and css files from plugin-survey directory
...
(rebased-with-history from commit 11be458d14
2024-06-07 22:49:07 +02:00
github-actions[bot]
300bf4bcb6
Version Packages ( #3283 )
...
* chore(release): version packages
* edit changelog text: survey JSON is object, not string
---------
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Becky Gilbert <beckyannegilbert@gmail.com>
(rebased-with-history from commit 02a76d1f65
2024-06-07 22:49:07 +02:00
Becky Gilbert
15d7d73528
Survey plugin rewrite ( fixes #2758 ) ( #3204 )
...
(rebased-with-history from commit 6d99a71fb1
2024-06-07 22:49:07 +02:00
Josh de Leeuw
8308f95ec4
Merge pull request #3214 from jspsych/changeset-release/main
...
Version Packages
(rebased-with-history from commit 8e56e57df7
2024-06-07 22:49:07 +02:00
Josh de Leeuw
d431e03c4b
Merge pull request #3213 from jspsych/add-response-ends-trial-vs-circle
...
Fix display clearing bug in visual search circle plugin version 1.2.0
(rebased-with-history from commit daea41bd16
2024-06-07 22:49:07 +02:00
Josh de Leeuw
79262362d7
Merge pull request #3212 from jspsych/changeset-release/main
...
Version Packages
(rebased-with-history from commit e278bff353
2024-06-07 22:49:07 +02:00
Josh de Leeuw
d7f4912eea
Merge pull request #3211 from jspsych/add-response-ends-trial-vs-circle
...
Add `response_ends_trial` for visual search circle plugin
(rebased-with-history from commit c64d3fe9b0
2024-06-07 22:49:07 +02:00
bjoluc
9042e8553f
Merge pull request #3126 from jspsych/changeset-release/main
...
Version Packages
(rebased-with-history from commit e94e6a79f0
2024-06-07 22:49:07 +02:00
bjoluc
084292f6cb
Merge pull request #3184 from jspsych/fix-sourcemap-urls
...
Point to source maps via canonical unpkg URLs in CI browser builds
(rebased-with-history from commit b8a85c7202
2024-06-07 22:49:07 +02:00
bjoluc
c31b859533
Merge pull request #3122 from jspsych/update-config-package
...
Update `@jspsych/config` dependencies
(rebased-with-history from commit 76fca2712f
2024-06-07 22:49:07 +02:00
bjoluc
3a2c717746
Refactor free-sort plugin to use pointer events ( #2893 )
...
(rebased-with-history from commit 2f37c57d22
2024-06-07 22:49:07 +02:00
Josh de Leeuw
fa24fa8062
Merge pull request #3074 from jspsych/changeset-release/main
...
Version Packages
(rebased-with-history from commit 8f0075b8a1
2024-06-07 22:49:07 +02:00
Josh de Leeuw
ee595c3dfc
Merge pull request #3073 from jspsych/config-bump-canvas
...
Update canvas version in config
(rebased-with-history from commit e85d0f4d26
2024-06-07 22:49:07 +02:00
Josh de Leeuw
5837568c2b
ensure that null values are allowed, even when there is a default
2024-06-03 13:51:23 -04:00
Josh de Leeuw
dc83096722
add block display to fix #3056
2024-06-03 11:48:56 -04:00
Josh de Leeuw
84dca432d2
update to canvas v2.11.2
2024-06-03 11:48:21 -04:00
Josh de Leeuw
10bdbd6a8f
Merge branch 'v8' into v8-css-updates
2024-06-03 10:34:07 -04:00
github-actions[bot]
e44dca7cf3
chore(release): version packages
2024-05-20 16:45:37 +00:00
Josh de Leeuw
87d2a8e0ab
Merge pull request #3298 from thtTNT/main
...
Add parameter "enable_button_after" to all "-button-response" plugins
2024-05-20 12:41:50 -04:00
Haotian Tu
a4088529cf
Add parameter "enable_button_after" to all "-button-response" plugins ( #3289 )
2024-05-20 23:07:14 +08:00
github-actions[bot]
c2dd493f6e
chore(release): version packages ( #3294 )
...
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
2024-05-15 11:33:43 -07:00
Becky Gilbert
7bcd4e0a25
fix incorrect path in dist gulp job (build:archive) ( #3293 )
...
* fix incorrect path in dist gulp job (build:archive)
* add changeset for config patch
2024-05-15 11:02:59 -07:00
github-actions[bot]
e201ca29af
Version Packages ( #3292 )
...
* chore(release): version packages
* edit changelogs
---------
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Becky Gilbert <beckyannegilbert@gmail.com>
2024-05-14 12:35:27 -07:00
Becky Gilbert
54e04dc93f
Survey plugin updates: fix CSS, clean up code/comments, add survey.css to dist archive ( #3287 )
...
* make applyStyles private and clean up comments
* fix box shadow in input elements
* fix dropdown element width
* remove old/unused plugin-survey.css file
* add survey.css to dist archive
* add changeset
2024-05-14 11:07:48 -07:00
Becky Gilbert
11be458d14
remove built dist and css files from plugin-survey directory
2024-04-30 16:24:49 -07:00
github-actions[bot]
02a76d1f65
Version Packages ( #3283 )
...
* chore(release): version packages
* edit changelog text: survey JSON is object, not string
---------
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Becky Gilbert <beckyannegilbert@gmail.com>
2024-04-30 16:10:21 -07:00
Becky Gilbert
6d99a71fb1
Survey plugin rewrite ( fixes #2758 ) ( #3204 )
2024-04-30 15:23:13 -07:00
Shaobin-Jiang
7845f00056
fix typo in randomInt error message
2024-03-01 14:39:28 +08:00
bjoluc
233deb6df4
Merge pull request #3201 from Shaobin-Jiang/message-progress-bar
...
Allow message_progress_bar to be a function
2024-02-02 23:09:39 +01:00
Shaobin-Jiang
4cb77e885d
move updateMessage into update
2024-01-16 09:11:07 +08:00
github-actions[bot]
2feb774174
chore(release): version packages
2024-01-14 18:51:19 +00:00
Josh de Leeuw
daea41bd16
Merge pull request #3213 from jspsych/add-response-ends-trial-vs-circle
...
Fix display clearing bug in visual search circle plugin version 1.2.0
2024-01-14 13:47:25 -05:00
Josh de Leeuw
d2d180967a
fix display_clear bug
2024-01-14 13:40:42 -05:00
github-actions[bot]
e17e2fd88a
chore(release): version packages
2024-01-14 18:06:19 +00:00
Josh de Leeuw
1c7d0af829
add test case for response_ends_trial
2024-01-14 12:54:35 -05:00
Josh de Leeuw
d54048b8d0
Add response_ends_trial parameter to VisualSearchCirclePlugin
2024-01-14 12:51:34 -05:00
Shaobin-Jiang
9d1d30986f
update unit test
2024-01-10 14:22:33 +08:00
Shaobin-Jiang
f0439475b4
fix updateMessage method
2024-01-10 14:22:20 +08:00
Shaobin-Jiang
4dbdbc0e68
refactor message updating
...
- adding a private `updateMessage` method
- using a simpler version of checking function type
2024-01-10 13:58:13 +08:00
Shaobin-Jiang
d1382968f4
allow message_progress_bar to be a function
2024-01-02 21:59:07 +08:00
Shaobin-Jiang
1c1849ca6c
rename instructions page_change_callback to on_page_change
2023-12-09 07:41:22 +08:00
Josh de Leeuw
2898da6c59
Merge pull request #3167 from jspsych/skip-data-logging
...
Allow skipping data logging for a trial with `record_data: false`
2023-12-08 10:37:10 -05:00
bjoluc
007d862523
Add a getResult[s]() unit test for the record_data: false parameter
2023-12-06 20:00:29 +01:00
bjoluc
ab7ad5a435
Handle undefined results
2023-12-06 19:56:24 +01:00
Shaobin-Jiang
14fd8573bd
add test case for page_change_callback
2023-11-23 22:21:08 +08:00
Shaobin-Jiang
fe15b373b6
add page_change_callback for plugin instructions
2023-11-23 22:20:44 +08:00
Josh de Leeuw
33c97c2423
return undefined in getResult when record_data is false
2023-11-10 16:45:06 -05:00
Josh de Leeuw
e3b2accd7d
add test for https://github.com/jspsych/jsPsych/pull/3167#discussion_r1386741392
2023-11-10 16:44:27 -05:00
github-actions[bot]
f765795d75
chore(release): version packages
2023-11-10 21:01:41 +00:00
bjoluc
9acfa29c8d
Point to source maps via canonical unpkg URLs in CI browser builds
2023-11-10 21:25:26 +01:00
bjoluc
76fca2712f
Merge pull request #3122 from jspsych/update-config-package
...
Update `@jspsych/config` dependencies
2023-11-10 21:15:13 +01:00
bjoluc
220f4e36b4
Update @jspsych/config dependencies
2023-11-10 19:37:25 +01:00
Josh de Leeuw
72ddfa01ad
Merge pull request #3168 from jspsych/abort-timeline-by-id
...
Add `abortTimelineByName()` to allow ending specific timelines
2023-11-09 12:24:29 -05:00
Josh de Leeuw
978a4c8f05
rename getTimelineByName => getActiveTimelineByName
2023-11-09 12:13:05 -05:00
bjoluc
3855b5d86d
Allow trial on_finish methods to be async ( #3182 )
2023-11-08 18:37:32 +01:00
Josh de Leeuw
d296962c7e
mock the audioplayer module and add tests
2023-11-08 09:55:02 -05:00
