Josh de Leeuw
|
969484f0e6
|
Merge branch 'master' into preload-docs
|
2021-02-12 11:28:47 -05:00 |
|
Josh de Leeuw
|
2f7e5cce62
|
some minor docs edits
|
2021-02-12 11:00:45 -05:00 |
|
Josh de Leeuw
|
a70d016844
|
Merge pull request #1508 from jspsych/docs-reorg
Docs reorg
|
2021-02-12 10:30:05 -05:00 |
|
Becky Gilbert
|
d9648d3dcd
|
fix broken links in docs
|
2021-02-11 18:20:25 -08:00 |
|
Becky Gilbert
|
f833a4a794
|
add dynamic-params page, rename trials page as plugins, add content from plugins/overview and creating-a-plugin and remove those pages from plugins section
|
2021-02-11 18:06:26 -08:00 |
|
Becky Gilbert
|
b112ec4d6f
|
move repetitions parameter out of timeline_vars subheading
|
2021-02-11 15:47:52 -08:00 |
|
Becky Gilbert
|
aa588c28d2
|
add preload plugin to plugin overview page
|
2021-02-11 15:13:50 -08:00 |
|
Becky Gilbert
|
5331b5c123
|
change numeric keyCodes to key strings, change valid keys to lowercase in examples/docs (missed these out in the earlier keyCode->key change)
|
2021-02-11 15:06:03 -08:00 |
|
Becky Gilbert
|
470c0d4c5f
|
remove auto_preload: false in jsPsych.init from tests because preloading is moved to plugin
|
2021-02-11 14:25:31 -08:00 |
|
Becky Gilbert
|
9729cd99ef
|
video tests just check that register preload is called, no longer test for auto-preloading
|
2021-02-11 14:24:29 -08:00 |
|
Becky Gilbert
|
301b4cb788
|
tweak plugin parameter descriptions
|
2021-02-11 14:22:01 -08:00 |
|
Becky Gilbert
|
4758d55f68
|
add preload plugin to docs structure
|
2021-02-11 13:53:47 -08:00 |
|
Becky Gilbert
|
3694d756f0
|
initial commit for preload plugin docs
|
2021-02-11 13:53:22 -08:00 |
|
Becky Gilbert
|
f1ee56973a
|
switch to preloading via preload plugin in example files
|
2021-02-11 12:12:53 -08:00 |
|
Becky Gilbert
|
b5211be302
|
tweak plugin descriptions to reflect switch to preload plugin
|
2021-02-11 12:12:19 -08:00 |
|
Becky Gilbert
|
fea41a71f6
|
remove references to preloading via jsPsych.init in experiment options docs page
|
2021-02-11 12:03:08 -08:00 |
|
Becky Gilbert
|
8238d9a9e3
|
update docs with preload plugin changes
|
2021-02-11 12:01:56 -08:00 |
|
Becky Gilbert
|
e67c75c092
|
update docs for preload plugin
|
2021-02-11 12:00:10 -08:00 |
|
Becky Gilbert
|
b4a174bd85
|
preload plugin changes: add getAutoPreloadList, remove autoPreload, preloadAudioFiles -> preloadAudio, update parameters and descriptions
|
2021-02-11 11:59:03 -08:00 |
|
Becky Gilbert
|
145d3e50fe
|
remove preload params from jsPsych.init docs
|
2021-02-11 11:54:48 -08:00 |
|
Josh de Leeuw
|
dea4b13354
|
added prolific intergration guide to docs
|
2021-02-10 12:38:40 -05:00 |
|
Josh de Leeuw
|
a2c124531f
|
add page on video tutorials
|
2021-02-10 10:02:16 -05:00 |
|
Josh de Leeuw
|
418e15db3d
|
Merge branch 'master' of https://github.com/jspsych/jsPsych
|
2021-02-10 09:05:06 -05:00 |
|
Josh de Leeuw
|
8c4d17d675
|
fix a few test console.log and console.error messages
|
2021-02-10 09:05:02 -05:00 |
|
Becky Gilbert
|
68c4a466ed
|
Merge pull request #1497 from jspsych/feature-nested-function-parameters
Merge feature-nested-function-parameters branch - fixes #988
|
2021-02-09 17:42:52 -08:00 |
|
Becky Gilbert
|
c51d30485a
|
add minor comment to example in docs
|
2021-02-09 17:35:52 -08:00 |
|
Becky Gilbert
|
92eb7d90dc
|
add note about protected functions
|
2021-02-09 17:30:31 -08:00 |
|
Becky Gilbert
|
45f5331156
|
add docs for nested function parameters
|
2021-02-09 17:17:33 -08:00 |
|
Becky Gilbert
|
d465c20b05
|
add tests
|
2021-02-09 17:17:08 -08:00 |
|
Josh de Leeuw
|
a1fe96d9eb
|
tutorial edits
|
2021-02-09 19:35:53 -05:00 |
|
Becky Gilbert
|
7e288d4481
|
change keyCodes to keys in calls to utils.pressKey()
|
2021-02-09 15:29:02 -08:00 |
|
Becky Gilbert
|
d01881c692
|
merge changes from master and fix merge conflict
|
2021-02-09 15:23:40 -08:00 |
|
Becky Gilbert
|
e81b2b1d37
|
Merge pull request #1496 from jspsych/feature-preload-plugin
Merge preload plugin branch into master
|
2021-02-09 14:27:56 -08:00 |
|
Becky Gilbert
|
51ee542e2e
|
update with changes to master and fix merge conflict
|
2021-02-09 14:22:59 -08:00 |
|
Becky Gilbert
|
a106dbbd13
|
fix tests for addNodeToEndOfTimeline (no longer accepts callback)
|
2021-02-09 14:18:31 -08: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 |
|
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
|
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
|
fbd9e4ca85
|
remove media folder from tests since functions are now mocked
|
2021-02-05 10:57:50 -05:00 |
|
Josh de Leeuw
|
bb07c913c7
|
change tests to use mock functions
|
2021-02-05 10:55:52 -05:00 |
|