Commit Graph

3442 Commits

Author SHA1 Message Date
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
4eba29d00d Merge pull request #3178 from jspsych/docs-update-setup-instructions
Update dev environment configuration docs

(rebased-with-history from commit d33176a5f3)
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
Josh de Leeuw
5ce28b34ed Merge pull request #3150 from ayugioh2003/main
fix broken "eye-tracking-with-webgazer" demo page 

(rebased-with-history from commit cd53e7e93b)
2024-06-07 22:49:07 +02:00
Nikolay Petrov
30b5587973 Making it clear when on_trial_start and on_trial_finish are executed. (#3118)
* Making it clear when on_trial_start and on_trial_finish are executed.

* Update docs/overview/events.md

Co-authored-by: bjoluc <mail@bjoluc.de>

* Update docs/overview/events.md

Co-authored-by: bjoluc <mail@bjoluc.de>

---------

Co-authored-by: bjoluc <mail@bjoluc.de>

(rebased-with-history from commit b78dcc6830)
2024-06-07 22:49:07 +02:00
bjoluc
5f4c073f1d Update docs dependencies
(rebased-with-history from commit 6d8aca9881)
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
bjoluc
ddd6cde2eb Upload dist archive for all releases (#3125)
(rebased-with-history from commit cb87df4c10)
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
8604ac50cb fix package-lock.json
(rebased-with-history from commit be0645e49a)
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
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
Josh de Leeuw
e278bff353
Merge pull request #3212 from jspsych/changeset-release/main
Version Packages
2024-01-14 13:07:18 -05:00
github-actions[bot]
e17e2fd88a chore(release): version packages 2024-01-14 18:06:19 +00:00
Josh de Leeuw
c64d3fe9b0
Merge pull request #3211 from jspsych/add-response-ends-trial-vs-circle
Add `response_ends_trial` for visual search circle plugin
2024-01-14 13:02:34 -05:00
Josh de Leeuw
ba39cca0da add documentation update 2024-01-14 12:56:52 -05:00
Josh de Leeuw
37430e13e9 add changeset 2024-01-14 12:56:38 -05: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
9727773036
fix changeset version 2024-01-10 13:57:37 +08:00
Shaobin-Jiang
be7df30379
add changeset 2024-01-03 09:43:45 +08:00
Shaobin-Jiang
ed9c268abe
update doc for message_progress_bar 2024-01-02 21:59:20 +08:00
Shaobin-Jiang
d1382968f4
allow message_progress_bar to be a function 2024-01-02 21:59:07 +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
bjoluc
d33176a5f3
Merge pull request #3178 from jspsych/docs-update-setup-instructions
Update dev environment configuration docs
2023-11-15 20:31:50 +01:00
bjoluc
e94e6a79f0
Merge pull request #3126 from jspsych/changeset-release/main
Version Packages
2023-11-15 20:22:10 +01: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
b8a85c7202
Merge pull request #3184 from jspsych/fix-sourcemap-urls
Point to source maps via canonical unpkg URLs in CI browser builds
2023-11-10 21:51:16 +01: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
a4c573e9b0 add documentation for abortTimelineByName 2023-11-09 12:23:39 -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
bjoluc
a192ac6636 Unpin Node v20 since nodejs/node#49497 is fixed 2023-11-08 17:42:04 +01:00
bjoluc
679cfaf07b Update dev environment configuration docs 2023-11-08 14:09:47 +01:00
Josh de Leeuw
7b1ae24f4e add abortTimelineByName() 2023-10-30 13:01:55 -04:00
Josh de Leeuw
6f9d01b2ae added record_data parameter 2023-10-30 09:48:07 -04:00