Commit Graph

1096 Commits

Author SHA1 Message Date
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
bjoluc
68930a2129
Merge branch 'main' into v8 2024-06-07 23:05:34 +02:00
Josh de Leeuw
28ccb0e66c Update link URL in about.md
(rebased-with-history from commit 474c1e1f78)
2024-06-07 22:49:07 +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]
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
15d7d73528 Survey plugin rewrite (fixes #2758) (#3204)
(rebased-with-history from commit 6d99a71fb1)
2024-06-07 22:49:07 +02:00
Becky Gilbert
09a56635ca add md extension to internal page links (#3275)
(rebased-with-history from commit c7659240ce)
2024-06-07 22:49:07 +02:00
Shaobin Jiang
9d092a83a2 Update getKeyboardResponse doc (#3261)
* fix `valid_responses` description
* add description for `minimum_valid_rt`

(rebased-with-history from commit a877a8f8b3)
2024-06-07 22:49:07 +02:00
brchristian
c58bb2c07b Typo fix in timeline.md (#3245)
(rebased-with-history from commit 02631c7e5b)
2024-06-07 22:49:07 +02:00
Josh de Leeuw
29dfdf32c4 Merge pull request #3274 from ayugioh2003/patch-2
fix: adjust eye-tracking demo link relative path

(rebased-with-history from commit 4bde699f2d)
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
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
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
Josh de Leeuw
a83590a85d fix broken links, add camera recorder docs 2024-06-06 21:34:20 -04:00
Josh de Leeuw
474c1e1f78
Update link URL in about.md 2024-06-05 08:51:27 -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]
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
6d99a71fb1
Survey plugin rewrite (fixes #2758) (#3204) 2024-04-30 15:23:13 -07:00
Becky Gilbert
c7659240ce
add md extension to internal page links (#3275) 2024-04-30 14:40:13 -07:00
Shaobin Jiang
a877a8f8b3
Update getKeyboardResponse doc (#3261)
* fix `valid_responses` description
* add description for `minimum_valid_rt`
2024-04-30 14:12:22 -07:00
brchristian
02631c7e5b
Typo fix in timeline.md (#3245) 2024-04-30 14:11:09 -07:00
John Chiu
14754f7941
fix: adjust eye-tracking demo link to relative link 2024-04-14 02:28:20 +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
github-actions[bot]
2feb774174 chore(release): version packages 2024-01-14 18:51:19 +00:00
github-actions[bot]
e17e2fd88a chore(release): version packages 2024-01-14 18:06:19 +00:00
Josh de Leeuw
ba39cca0da add documentation update 2024-01-14 12:56:52 -05:00
Shaobin-Jiang
ed9c268abe
update doc for message_progress_bar 2024-01-02 21:59:20 +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
Shaobin-Jiang
7eac06cb58
update documentation for plugin instructions 2023-11-23 22:21:27 +08: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
github-actions[bot]
f765795d75 chore(release): version packages 2023-11-10 21:01:41 +00:00
Josh de Leeuw
a4c573e9b0 add documentation for abortTimelineByName 2023-11-09 12:23:39 -05:00
bjoluc
679cfaf07b Update dev environment configuration docs 2023-11-08 14:09:47 +01:00
Josh de Leeuw
6f9d01b2ae added record_data parameter 2023-10-30 09:48:07 -04:00
Josh de Leeuw
c4ccc9aa49 remove exlcusions parameter from initJsPsych() 2023-10-27 09:39:01 -04:00
Josh de Leeuw
9d2876987f fix an example for html-audio-response that used old button_html syntax 2023-10-19 11:47:29 -04:00
Josh de Leeuw
516dae4b86 add example for html-button-response 2023-10-19 11:24:38 -04:00
Josh de Leeuw
a7c13f2723 Adding/fixing examples for audio-button-response 2023-10-19 11:00:35 -04:00
Josh de Leeuw
45e0d65e7d update documentation for button_html and button_layout 2023-10-19 09:24:22 -04:00
John Chiu
cc3b1a1230
Update eye-tracking-with-webgazer.html
page demos/eye-tracking-with-webgazer broken
Uncaught ReferenceError: jsPsychHtmKeyboardResponse is not defined

refs:
- https://www.jspsych.org/7.0/demos/eye-tracking-with-webgazer.html
- https://www.jspsych.org/7.3/overview/eye-tracking/#example
2023-10-13 02:44:08 +08:00
Josh de Leeuw
5b56837a8c add note about interaction data recording ending when experiment ends 2023-09-23 13:49:47 -04:00
Josh de Leeuw
af4ee534f5 rename endExperiment and endCurrentTimeline 2023-09-23 13:48:51 -04:00
Josh de Leeuw
2aa9e63d84 remove functions related to internal_node_id 2023-09-23 13:46:32 -04:00
Josh de Leeuw
754b54e55e document save_timeline_variables 2023-09-23 13:44:43 -04:00
Josh de Leeuw
77725fa1f5 remove getAllTimelineVariables doc 2023-09-23 13:42:07 -04:00
Josh de Leeuw
0f68893daa replace timelineVariable with evaluateTimelineVariable where appropriate 2023-09-23 13:39:57 -04:00
Josh de Leeuw
a2661f77e1 update style.md for timeline variable change 2023-09-22 21:12:13 -04:00
Josh de Leeuw
33d8273097 update timeline overview for evaluateTimelineVariable, conditional function 2023-09-22 21:09:39 -04:00
Josh de Leeuw
63ce26e0f2 update on_timeline_start and on_timeline_end docs 2023-09-22 20:58:23 -04:00
Josh de Leeuw
7339dfcac3
Merge branch 'v8' into core-rewrite 2023-09-22 16:56:31 -04:00
Josh de Leeuw
826cf38bf0 update description of save_timeline_variables 2023-09-22 16:39:01 -04:00
Josh de Leeuw
5a1b338d19 remove internal_node_id references from the docs 2023-09-22 16:37:44 -04:00
Josh de Leeuw
d4d4ed33b7 update progress bar documentation for v8 2023-09-22 16:37:33 -04:00
Josh de Leeuw
6bede8c3a4 add a migration guide for version 8 2023-09-22 16:37:19 -04:00
Josh de Leeuw
771624cf43 remove internal_node_id references from the docs 2023-09-22 16:33:05 -04:00
Josh de Leeuw
65455d9779 update progress bar documentation for v8 2023-09-22 16:29:58 -04:00
Josh de Leeuw
943091ffd4 add a migration guide for version 8 2023-09-22 16:18:21 -04:00
Nikolay Petrov
b78dcc6830
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>
2023-09-15 11:42:35 +02:00
bjoluc
9cac68a140 Merge branch 'main' into core-rewrite 2023-07-13 17:38:45 +02:00
github-actions[bot]
be2f69382c chore(release): version packages 2023-05-17 20:01:29 +00:00
Josh de Leeuw
09ee347fa5 Add RT property to fullscreen data collection. Support setting this property in simulation mode. #2462 2023-05-17 14:00:04 -04:00
Josh de Leeuw
ba66284e80 Merge branch 'main' of https://github.com/jspsych/jsPsych 2023-05-11 10:08:18 -04:00
Josh de Leeuw
a26a3c7cec add trial duration to example code 2023-05-11 10:08:11 -04:00
Josh de Leeuw
4bf8f6f75c update citations across all readme 2023-05-11 09:44:23 -04:00
Josh de Leeuw
def9a6da4b placeholder for JOSS citation 2023-05-08 14:47:48 -04:00
Josh de Leeuw
e409b03d64
Merge pull request #2975 from jspsych/changeset-release/main
Version Packages
2023-03-06 10:59:56 -05:00
github-actions[bot]
9a89940c73 chore(release): version packages 2023-03-06 15:42:53 +00:00
Jeremy Bunting
fb97ec1673
Fix for broken link on hello-world 2023-02-23 15:16:21 -05:00
emengd
55a50966d2
Fix typo in documentation
I was very confused by the documentation of `getCurrentTimelineNodeID` until I realized there is a typo.
2023-02-01 18:14:50 +01:00
Josh de Leeuw
3704a528b8
Merge pull request #2946 from jadeddelta/sketchpad-doc-update
sketchpad documentation fixes
2023-01-24 09:06:46 -05:00
jadeddelta
5be8bce5dd fix ambiguity in save_final_image + style update 2023-01-23 22:06:14 -05:00
Josh de Leeuw
8759217f0e Add options (randomize_item_locations and location_first_item) to allow for fixed locations of the item array across trials. 2022-12-06 17:07:20 -05:00
bjoluc
4533e3d012 Fix webgazer CDN URLs 2022-11-24 21:37:05 +01:00
Dillon Plunkett
c8213c8d1b
fix a typo in image-keyboard-response description (#2876) 2022-11-21 18:19:58 +01:00
bjoluc
2e40d013d4 Drop support for npm v7 and node up to v16 2022-11-18 23:08:46 +01:00
Josh de Leeuw
1b14e05995 Fix button_label_back in survey plugin documentation 2022-11-01 15:02:51 -04:00
jadeddelta
3f91e52900 simulation bugfix pt. 2 + docs 2022-10-31 21:52:38 -04:00
Zhaobin Li
bba13d3c99 fixed browser-check typo in doc demos 2022-10-18 12:08:37 -04:00
Zhaobin Li
c75c80b7e7 fixed browser-check typo in doc example 2022-10-18 11:24:51 -04:00
github-actions[bot]
0f5181adb6 chore(release): version packages 2022-10-12 14:35:29 +00:00
Becky Gilbert
2a081607bf add section on updating live site, add npm docs commands, fix typos 2022-10-07 16:53:35 -07:00
Becky Gilbert
399b4e0516 fix formatting for last example 2022-10-07 16:27:40 -07:00
Becky Gilbert
540046b108 edit info admonitions: add titles, make collapsible, fix links, formatting and typos 2022-10-07 14:42:34 -07:00
Becky Gilbert
cbd487f2a5 clarify wording of cloze plugin mistake_fn description 2022-10-07 13:50:37 -07:00
Becky Gilbert
784cb4997c fix typo 2022-10-07 13:31:37 -07:00
Becky Gilbert
f582dc914c fix info box formatting (compare keys), add info box (timeline reps and randomizing) - fixes #2783 2022-10-07 13:10:35 -07:00
Becky Gilbert
10930af331 Merge branch 'main' of https://github.com/jspsych/jsPsych 2022-10-06 16:37:05 -07:00
Becky Gilbert
468545c281 add survey demo showing how to add trial data - fixes #2548 2022-10-06 16:32:08 -07:00
Becky Gilbert
fc78351ac1 add note about compareKeys - fixes #2400 2022-10-06 15:16:21 -07:00
github-actions[bot]
5d1cb0310d chore(release): version packages 2022-10-05 17:59:11 +00:00
Josh de Leeuw
52827bd552
Merge pull request #2784 from jadeddelta/cloze-checkblank
Cloze `allow_blanks` functionality
2022-10-01 14:17:21 -04:00