Becky Gilbert
|
d01881c692
|
merge changes from master and fix merge conflict
|
2021-02-09 15:23:40 -08:00 |
|
Becky Gilbert
|
51ee542e2e
|
update with changes to master and fix merge conflict
|
2021-02-09 14:22:59 -08:00 |
|
Josh de Leeuw
|
7196bb316f
|
fix merge mistake
|
2021-02-09 14:27:52 -05:00 |
|
Becky Gilbert
|
c8298e226f
|
merge master into preload plugin branch and fix merge conflict
|
2021-02-09 10:57:46 -08:00 |
|
Josh de Leeuw
|
89a99da36f
|
Merge branch 'feature-all-timeline-vars' into feature-timeline-events
|
2021-02-09 13:32:18 -05:00 |
|
Josh de Leeuw
|
e0c0cc1d08
|
Merge pull request #1492 from jspsych/master
merge master updates into feature-all-timeline-vars-branch
|
2021-02-09 13:16:58 -05:00 |
|
Josh de Leeuw
|
b10c69eb21
|
Merge branch 'master' into feature-key-code-update
|
2021-02-08 22:00:09 -05:00 |
|
Becky Gilbert
|
67a262eb55
|
change key response to lowercase when case_sensitive is false
|
2021-02-08 17:03:53 -08:00 |
|
Josh de Leeuw
|
8dd61e6bed
|
conditional_function only runs with first set of variables #585
|
2021-02-04 21:50:23 -05:00 |
|
Becky Gilbert
|
711504887f
|
add case_sensitive_responses option to jsPsych.init, add tests and example #396
|
2021-02-04 17:31:51 -08:00 |
|
Josh de Leeuw
|
21e7fa34c1
|
add version info to jspsych.js #1472
|
2021-02-04 13:49:44 -05:00 |
|
Becky Gilbert
|
bce6c030a7
|
minor edit to console.warn messages
|
2021-02-03 09:52:24 -08:00 |
|
Becky Gilbert
|
72af0b870f
|
add console.warn to pluginAPI keyCode functions
|
2021-02-02 16:10:45 -08:00 |
|
Becky Gilbert
|
9ea3c6517a
|
change KEYCODE parameter type to KEY #396
|
2021-02-02 12:30:15 -08:00 |
|
Becky Gilbert
|
56abce0a2f
|
revert webgazer commits #396
|
2021-01-29 17:42:16 -08:00 |
|
Josh de Leeuw
|
7c14e31126
|
fix nested timeline test #1351
|
2021-01-29 17:30:47 -05:00 |
|
Becky Gilbert
|
12bdd82b91
|
store preload requests and add pluginAPI.cancelPreloads function, fix 404 error logging for webaudio and video #1351
|
2021-01-28 16:06:53 -08:00 |
|
Becky Gilbert
|
692b3cbfa2
|
change preload callback functions so that they return file name and error, rather than load count #1351
|
2021-01-27 16:28:24 -08:00 |
|
Josh de Leeuw
|
1caecc6bf9
|
fixes protection of nested function params, adds test
|
2021-01-27 11:47:54 -05:00 |
|
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
|
87b210112d
|
add on_timeline_finish when repetition happens
|
2021-01-26 13:51:31 -05: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 |
|
Becky Gilbert
|
188cb14e3d
|
Merge branch 'master' into feature-css-class-trial
|
2021-01-18 12:18:43 -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
|
9d92c58c13
|
fix broken tests, variable reference error
|
2021-01-08 14:47:51 -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
|
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
|
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
|
f39f394866
|
adds test and handles non-array #832
|
2020-12-29 22:06:28 -05:00 |
|
Josh de Leeuw
|
24369ff282
|
implements a first pass at #1237
|
2020-12-28 13:59:19 -05:00 |
|
Josh de Leeuw
|
76c5d02597
|
add additional testing for #832, fixes function declaration
|
2020-12-26 17:24:33 -05:00 |
|
Josh de Leeuw
|
f6ac098b4c
|
first draft of #832
|
2020-12-23 09:56:40 -05:00 |
|
Josh de Leeuw
|
96c4a874ef
|
allow for recursive eval of parameters for #988
|
2020-12-17 15:36:16 -05:00 |
|
Josh de Leeuw
|
b6a28b0433
|
adds first pass at #883
|
2020-12-16 15:15:41 -05:00 |
|
Josh de Leeuw
|
b8225d7add
|
first pass at implementation and test for timeline start and finish events (#585)
|
2020-12-16 10:49:10 -05:00 |
|
Becky Gilbert
|
0e2745c79d
|
improve preloading test based on console.warn
|
2020-12-07 16:57:01 -08:00 |
|
Becky Gilbert
|
82c0eeafb3
|
fix typo in localSave link
|
2020-12-07 13:46:14 -08:00 |
|
Becky Gilbert
|
918df9475f
|
add link to safe mode console.warn message
|
2020-12-03 16:40:49 -08:00 |
|
Becky Gilbert
|
a433d81c90
|
merge in the video parameter name changes from master
|
2020-12-03 15:43:15 -08:00 |
|
Becky Gilbert
|
de9149c158
|
Merge pull request #1261 from jspsych/video-plugin-testing
video-* plugins: stim parameter name change and tests
|
2020-12-03 14:21:18 -08:00 |
|
Becky Gilbert
|
7cd7fc65f4
|
remove HTML5 stalled event listener & check for progress bar before updating - fixes #1262
|
2020-12-03 11:01:19 -08:00 |
|
Becky Gilbert
|
91f774a50a
|
add protocol check and file_protocol flag to disable Web Audio and video preloading (CORS errors)
|
2020-12-02 17:44:34 -08:00 |
|