Becky Gilbert
|
c3adf103a4
|
add console logs for debugging extra frame
|
2021-05-04 16:56:30 -07:00 |
|
Becky Gilbert
|
773347a386
|
update rAF handle in timeout_handlers so that it is cleared with clearAllTimeouts
|
2021-04-27 15:40:29 -07:00 |
|
Becky Gilbert
|
2214115e44
|
remove double rAF from setTimeout, because rAF is being called continuously
|
2021-04-27 14:26:31 -07:00 |
|
Becky Gilbert
|
564c843566
|
fix rAF function name (no need to use window prefix)
|
2021-04-27 14:23:53 -07:00 |
|
Becky Gilbert
|
2a032a8d1a
|
move rAF start timestamp from rAF callback to setTimeout
|
2021-04-27 14:23:24 -07:00 |
|
Becky Gilbert
|
f39211726f
|
in pluginAPI.setTimeout, use performance.now instead of timestamps passed into rAF (unreliable)
|
2021-04-23 15:39:01 -07:00 |
|
Becky Gilbert
|
01eae11e1b
|
in doTrial, put plugin.trial and subsequent functions in rAF callback
|
2021-04-23 15:37:02 -07:00 |
|
Becky Gilbert
|
cf7517f75e
|
switch ITIs from setTimeout to rAF
|
2021-04-23 15:04:16 -07:00 |
|
Becky Gilbert
|
eb96f58ebc
|
fix checkForTimeouts function definition and name error, pass the rAF-recorded duration to callback function
|
2021-04-20 15:18:40 -07:00 |
|
Becky Gilbert
|
a6f39f9f4f
|
Merge branch 'master' of https://github.com/jspsych/jsPsych into feature-settimeout-to-raf
|
2021-04-19 18:03:36 -07:00 |
|
Becky Gilbert
|
fb2ad41224
|
move WebAudio keyboard RT seconds-to-ms conversion from audio-keyboard-response plugin to getKeyboardResponse
|
2021-04-09 13:41:31 -07:00 |
|
Becky Gilbert
|
94a094f628
|
fix minimum_valid_rt when the web audio timing method is used in getKeyboardResponse - fixes #1675
|
2021-04-09 11:25:05 -07:00 |
|
Becky Gilbert
|
deb3dd6287
|
allow jsPsych.pluginAPI.compareKeys to handle null arguments, add tests - fixes #1577
|
2021-03-25 09:23:44 -07:00 |
|
Becky Gilbert
|
80f86a4673
|
first pass at #75 - work in progress
|
2021-02-26 11:18:43 -08:00 |
|
Josh de Leeuw
|
3713be80f4
|
Merge branch 'master' into feature-params-in-data
|
2021-02-20 17:09:33 -05:00 |
|
Becky Gilbert
|
0800497060
|
Merge branch 'master' into feature-key-code-update
|
2021-02-19 10:24:21 -08:00 |
|
Becky Gilbert
|
d22bdf1021
|
default to case-insensitive in compareKeys and getKeyboardResponse if called before jsPsych.init, add tests #396
|
2021-02-19 10:18:52 -08:00 |
|
Josh de Leeuw
|
5cdca4f8ad
|
update audio plugins to use new getAudioBuffer strategy
|
2021-02-18 22:32:50 -05:00 |
|
Josh de Leeuw
|
1b4b9d7e3b
|
switch getAudioBuffer to a Promise
|
2021-02-18 21:48:19 -05:00 |
|
Becky Gilbert
|
3b260eda31
|
implement case-sensitive/case-insensitive key comparison in jsPsych.pluginAPI.compareKeys, depending on jsPsych.init case_sensitive_responses setting #396
|
2021-02-18 12:48:54 -08:00 |
|
Becky Gilbert
|
2312550127
|
Merge branch 'master' into feature-objects-arrays-in-data
|
2021-02-16 14:37:07 -08:00 |
|
Josh de Leeuw
|
00a02e9022
|
remove old comment header
|
2021-02-15 21:57:06 -05:00 |
|
Josh de Leeuw
|
0701d44594
|
fix missing extensions module
|
2021-02-15 21:53:41 -05:00 |
|
Josh de Leeuw
|
5a1acb90d2
|
fix missing default value
|
2021-02-15 21:46:42 -05:00 |
|
Josh de Leeuw
|
e5a8a77ef3
|
Merge branch 'master' into feature-plugin-extensions
|
2021-02-15 21:44:45 -05:00 |
|
Becky Gilbert
|
94d72ddf82
|
merge changes from master and fix merge conflicts #670
|
2021-02-12 15:58:48 -08:00 |
|
Becky Gilbert
|
080b2955da
|
Merge branch 'master' into feature-timeline-events
|
2021-02-12 10:58:01 -08:00 |
|
Josh de Leeuw
|
1b2f1a2699
|
fix the on_timeline_start issue
|
2021-02-10 17:58:45 -05:00 |
|
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
|
caac84601a
|
fix fail -> catch
|
2021-02-07 17:11:51 -05:00 |
|
Josh de Leeuw
|
18014cbe5f
|
allow parameters for extensions in a trial
|
2021-02-05 14:15:51 -05: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
|
a11550c2f6
|
fix case where no extensions are loaded
|
2021-02-04 17:25:28 -05: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 |
|