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
2,202 Commits 14 Branches 506 Tags 58 MiB
af8ce43784
Commit Graph

2202 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Josh de Leeuw
3ff8b7c719 still just a partial solution, transfer commit 2021-01-26 22:10:53 -05:00
Josh de Leeuw
c55c82c659 partial solution, in between commit to transfer environment 2021-01-26 20:24:57 -05:00
Josh de Leeuw
e0ee7f02e2 conditional_function only runs once when repetitions > 0 2021-01-26 15:32:57 -05:00
Josh de Leeuw
d22ce24264 update expected behavior of timeline events 2021-01-26 13:52:58 -05:00
Josh de Leeuw
87b210112d add on_timeline_finish when repetition happens 2021-01-26 13:51:31 -05:00
Becky Gilbert
44b5b478e5 add preload example file 2021-01-19 17:00:19 -08:00
Becky Gilbert
661df3e078 add success and timeout flags to data, record failed files, clear display, separate functions for timeout and success #1351 2021-01-19 16:57:34 -08:00
Becky Gilbert
e26fbab295 change jsPsych.pluginAPI.preloadAudioFiles to preloadAudio (for consistency with images and video) #1351 2021-01-19 16:51:16 -08:00
Josh de Leeuw
66c8452da6
Merge pull request #1384 from jspsych/bug-fix-respond-while-playing 
fixes allow_response_while_playing parameter when custom button_html is used #1380
 2021-01-19 17:00:59 -05:00
Josh de Leeuw
6afe9ce086 fixes #1380 2021-01-19 16:51:43 -05:00
Becky Gilbert
e32b299d56
Merge pull request #1378 from jspsych/feature-css-class-trial 
Add feature: css_classes trial parameter
 2021-01-18 12:19:50 -08:00
Becky Gilbert
188cb14e3d
Merge branch 'master' into feature-css-class-trial 2021-01-18 12:18:43 -08:00
Becky Gilbert
d1a876d280
Merge pull request #1376 from jspsych/feature-timeline-variable-simplify 
Merge feature-timeline-variable-simplify - fixes #883
 2021-01-18 09:52:35 -08:00
Becky Gilbert
519abbdb47
Merge pull request #1375 from jspsych/bugfix-image-canvas 
add img onload fn to draw image when loaded - fixes #1305
 2021-01-18 09:52:02 -08:00
Josh de Leeuw
74fae253cc update locations in docs where keyCode is used 2021-01-15 21:53:38 -05:00
Becky Gilbert
f539669203 first draft of new style docs page - #832 2021-01-15 15:44:30 -08:00
Becky Gilbert
4203a047f7 minor tweak to example 2021-01-15 15:42:05 -08:00
Josh de Leeuw
6a2dc21bc8 replaces keyCode with .key, gets all tests working 2021-01-15 17:55:12 -05:00
Josh de Leeuw
04d5da4d94 pause on load 2021-01-14 15:37:45 -05:00
Josh de Leeuw
d520898072 formatting 2021-01-14 15:35:56 -05:00
Josh de Leeuw
b78efaac73 adding a validation accuracy metric 2021-01-14 15:33:41 -05:00
Becky Gilbert
9147a2dce5 use css_classes parameter instead of inline style for stim size #832 2021-01-13 12:02:54 -08:00
Becky Gilbert
62ab659981 add examples with specific CSS selectors, fix note about inheritance #832 2021-01-13 11:53:53 -08:00
Becky Gilbert
5c653f4bde remove uncessary true argument from jsPsych.timelineVariable in examples/tests #883 2021-01-13 10:08:38 -08:00
Becky Gilbert
a496871984 update docs for #883 2021-01-13 10:07:48 -08:00
Josh de Leeuw
42f54f0fb3 tweaking calibration and validation scripts 2021-01-13 09:47:11 -05:00
Josh de Leeuw
6006293416 fixes circle drawing problem 2021-01-13 09:23:05 -05:00
Josh de Leeuw
b146037af3 calibration + validation sort of working... 2021-01-12 17:52:41 -05:00
Becky Gilbert
761491ed94 tweak example HTML file classes and add note about inheritance #832 2021-01-12 14:07:24 -08:00
Josh de Leeuw
cf9fd335bb working on plugin modes 2021-01-12 09:27:04 -05:00
Becky Gilbert
29d5aaa1c4 add css_classes to plugin overview docs, add example HTML file #832 2021-01-11 17:34:08 -08:00
Becky Gilbert
4610a7ac83 add img onload fn to draw image when loaded - fixes #1305 2021-01-09 11:18:57 -08:00
Josh de Leeuw
9d92c58c13 fix broken tests, variable reference error 2021-01-08 14:47:51 -05:00
Josh de Leeuw
57c04dac10 improvements to calibration using MutationObserver 2021-01-08 14:22:21 -05:00
Josh de Leeuw
d5d462d4c8 switch auto_preload to bool, add trials parameter, implement working tests 2021-01-07 22:15:38 -05:00
Josh de Leeuw
df4057bd52 remove outdated test 2021-01-07 16:15:13 -05:00
Josh de Leeuw
83a6ea61c9 add working test 2021-01-07 16:13:34 -05:00
Josh de Leeuw
3f1abdec88 adjust getAutoPreloadList to work with timeline description 2021-01-07 16:13:26 -05:00
Josh de Leeuw
6135ed47d5 remove the conditional_function option from registerPreload 2021-01-07 16:06:48 -05:00
Josh de Leeuw
e892d58e2e remove preloading from jsPsych.init 2021-01-07 15:54:05 -05:00
Josh de Leeuw
ba1e7a72c9 core of preload plugin 2021-01-07 10:05:47 -05:00
Josh de Leeuw
d4830275d5 working on shifting preload stuff 2021-01-07 09:19:16 -05:00
Josh de Leeuw
3a08b15fc9 start implementing plugin, didn't get far yet 2021-01-06 18:54:28 -05:00
Josh de Leeuw
fdb0209bb0 working on webgazer stuff 2021-01-06 18:41:37 -05:00
Josh de Leeuw
562e993f9c adding a calibration routine, but it's not great 2021-01-02 17:20:21 -05:00
Josh de Leeuw
0ac9fc0d5a add event hooks in jspsych.js 2021-01-02 13:55:50 -05:00
Josh de Leeuw
26a70adc05 filling out extension code 2021-01-02 13:44:28 -05:00
Josh de Leeuw
9c22731413 begin working on webgazer extensions 2021-01-01 21:26:03 -05:00
Josh de Leeuw
f39f394866 adds test and handles non-array #832 2020-12-29 22:06:28 -05:00
Josh de Leeuw
5881c4455e added tests for #883 2020-12-29 21:57:20 -05:00