Josh de Leeuw
|
a1fe96d9eb
|
tutorial edits
|
2021-02-09 19:35:53 -05:00 |
|
Josh de Leeuw
|
4899abd18b
|
Merge pull request #1493 from jspsych/feature-all-timeline-vars
Add allTimelineVariables() feature
|
2021-02-09 14:31:44 -05:00 |
|
Josh de Leeuw
|
7196bb316f
|
fix merge mistake
|
2021-02-09 14:27:52 -05:00 |
|
Josh de Leeuw
|
0272250bb4
|
Merge pull request #1494 from jspsych/feature-timeline-events
merge timeline events into all timeline vars branch
|
2021-02-09 14:26:36 -05: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
|
c167972e05
|
add docs for .allTimelineVariables()
|
2021-02-09 13:23:58 -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
|
9bfeaff84a
|
Merge pull request #1413 from pablobernabeu/patch-5
Fixed typo in media-preloading.md
|
2021-02-08 22:16:12 -05:00 |
|
Josh de Leeuw
|
b21f7c8740
|
Merge pull request #1465 from jspsych/feature-key-code-update
Merge feature-key-code-update branch
|
2021-02-08 22:05: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
|
89833f2048
|
update case-sensitive example
|
2021-02-08 17:20:24 -08:00 |
|
Becky Gilbert
|
ce2e4ddc74
|
change key prompt to lowercase
|
2021-02-08 17:04:24 -08: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
|
7dbcfea7da
|
add a test to ensure loop function runs only once with TVs #585
|
2021-02-04 21:53:55 -05:00 |
|
Josh de Leeuw
|
8dd61e6bed
|
conditional_function only runs with first set of variables #585
|
2021-02-04 21:50:23 -05:00 |
|
Josh de Leeuw
|
9da9f4eaf0
|
the broken test should resolve when we merge in changes from feature-timeline-events branch
|
2021-02-04 21:41:49 -05:00 |
|
Becky Gilbert
|
7618bc3cbb
|
add case_sensitive_responses parameter to docs #396
|
2021-02-04 17:43:00 -08: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
|
278668d048
|
change keyCode to key in keyboard event passed to dispatchEvent
|
2021-02-03 11:19:46 -08:00 |
|
Becky Gilbert
|
13c39d29f6
|
fix typo
|
2021-02-03 11:17:18 -08:00 |
|
Becky Gilbert
|
bce6c030a7
|
minor edit to console.warn messages
|
2021-02-03 09:52:24 -08:00 |
|
Becky Gilbert
|
94bfef73ab
|
use lower case letters in prompts and param values, fix image sizing/preloading
|
2021-02-02 18:13:23 -08:00 |
|
Becky Gilbert
|
b2fc3a0a77
|
switch example files to string-based keys #396
|
2021-02-02 17:07:36 -08:00 |
|
Becky Gilbert
|
1f16ed1ee6
|
remove keyCode-related functions from pluginAPI docs #396
|
2021-02-02 16:15:23 -08:00 |
|
Becky Gilbert
|
72af0b870f
|
add console.warn to pluginAPI keyCode functions
|
2021-02-02 16:10:45 -08:00 |
|
Becky Gilbert
|
bc585ee64a
|
fix minor errors in plugin/parameter descriptions
|
2021-02-02 15:02:26 -08:00 |
|
Becky Gilbert
|
41bc9d725e
|
switch to only using strings for keyboard keys, change keyboard key parameter types/defaults, remove compareKeys fn #396
|
2021-02-02 15:01:38 -08:00 |
|
Becky Gilbert
|
9ea3c6517a
|
change KEYCODE parameter type to KEY #396
|
2021-02-02 12:30:15 -08:00 |
|
Becky Gilbert
|
bc14216254
|
change all numeric key codes to key strings in docs #396
|
2021-02-02 12:25:11 -08:00 |
|
Becky Gilbert
|
662b6c0d2e
|
fix duration param typo
|
2021-02-01 18:08:44 -08:00 |
|
Becky Gilbert
|
fd097e996d
|
switch from keyCodes to key strings, fix param description errors and typos
|
2021-02-01 17:48:52 -08:00 |
|
Becky Gilbert
|
8dadd0d8e5
|
function name typo
|
2021-02-01 14:15:24 -08:00 |
|
Becky Gilbert
|
56abce0a2f
|
revert webgazer commits #396
|
2021-01-29 17:42:16 -08:00 |
|
Pablo Bernabeu
|
c55648a12e
|
Fixed typo in media-preloading.md
Fixed typo (`timline`) in media-preloading.md
|
2021-01-27 03:15:01 +00: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 |
|
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 |
|