HoshinoKoji/jsPsych
1
0
Fork 0
mirror of https://github.com/jspsych/jsPsych.git synced 2025-05-12 08:38:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,400 Commits 14 Branches 506 Tags 58 MiB
8604ac50cb
Commit Graph

3400 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
bjoluc
9926a797b9
Merge pull request #2858 from jspsych/core-rewrite 
Core rewrite
 2023-10-24 11:10:50 +02: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
bb3d82a548
Merge pull request #3152 from jspsych/button-plugin-update 
Add `button_layout` parameter to support CSS grid
 2023-10-19 09:27:39 -04:00
Josh de Leeuw
45e0d65e7d update documentation for button_html and button_layout 2023-10-19 09:24:22 -04:00
Josh de Leeuw
acce785dd7 manually update snapshots 2023-10-19 09:10:56 -04:00
Josh de Leeuw
a99c7b7963 fix typo in class name 2023-10-19 09:10:35 -04:00
Josh de Leeuw
9cabb614e7 update formatting in changeset 2023-10-18 15:52:54 -04:00
Josh de Leeuw
d7f3040d51 fix copy/paste error of div name 2023-10-18 15:45:06 -04:00
Josh de Leeuw
66f813f9ca update changeset 2023-10-18 15:37:47 -04:00
Josh de Leeuw
808e835306 use clearer error message when rows and columns both null 2023-10-18 15:05:15 -04:00
Josh de Leeuw
11e0103678 button_rows -> grid_rows; button_cols -> grid_columns 2023-10-18 15:02:41 -04:00
Josh de Leeuw
ed99076c3c implements modifications in all button response plugins 2023-10-18 15:00:00 -04:00
Josh de Leeuw
2852cda642 add changeset 2023-10-18 14:47:59 -04:00
Josh de Leeuw
4998825980 change how rows and cols are calculated, change css layout, add example 2023-10-18 14:42:46 -04:00
Josh de Leeuw
dec9bef382 Add grid option, make it default 2023-10-16 11:56:46 -04: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