Commit Graph

665 Commits

Author SHA1 Message Date
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
301b4cb788 tweak plugin parameter descriptions 2021-02-11 14:22:01 -08:00
Becky Gilbert
3694d756f0 initial commit for preload plugin docs 2021-02-11 13:53:22 -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
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
Josh de Leeuw
a1fe96d9eb tutorial edits 2021-02-09 19:35:53 -05:00
Becky Gilbert
daa37b7cfd correction to docs on on_timeline_start 2021-02-09 13:58:17 -08:00
Becky Gilbert
10aa0f64e2 add docs for on_timeline_start and on_timeline_finish 2021-02-09 12:47:16 -08:00
Josh de Leeuw
c167972e05 add docs for .allTimelineVariables() 2021-02-09 13:23:58 -05:00
Josh de Leeuw
bb0b84d86a add samples_per_sec to validation plugin 2021-02-08 23:00:19 -05:00
Josh de Leeuw
ac5755e1dd add note about computational resources 2021-02-08 22:36:31 -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
b10c69eb21
Merge branch 'master' into feature-key-code-update 2021-02-08 22:00:09 -05:00
Becky Gilbert
5fc9cfb91f add more info about webgazer functions and their use 2021-02-05 18:13:14 -08:00
Becky Gilbert
16b5c2cb6a add comments to extension template 2021-02-05 18:00:48 -08:00
Becky Gilbert
0f5a17749b add extensions option to jsPsych.init parameters in core docs 2021-02-05 17:54:04 -08:00
Becky Gilbert
e78c4573eb add extensions to experiment options docs 2021-02-05 17:47:07 -08:00
Becky Gilbert
e46f33a2b1 added basic complete code/data example to docs (data needs fixing) 2021-02-05 17:36:16 -08:00
Josh de Leeuw
af95ebe7c1 create targets parameter for webgazer ext 2021-02-05 14:16:03 -05:00
Josh de Leeuw
18014cbe5f allow parameters for extensions in a trial 2021-02-05 14:15:51 -05:00
Josh de Leeuw
7c7fda1959 add round_predictions parameter 2021-02-05 13:31:04 -05:00
Becky Gilbert
7618bc3cbb add case_sensitive_responses parameter to docs #396 2021-02-04 17:43:00 -08:00
Josh de Leeuw
00d650a7de moving some functionality to init-camera plugin, adding docs 2021-02-04 17:19:34 -05:00
Josh de Leeuw
9e0cc86796 add plugin docs for webgazer 2021-02-04 16:36:44 -05:00
Josh de Leeuw
81977c15da add extension docs 2021-02-04 15:06:17 -05:00
Josh de Leeuw
21e7fa34c1 add version info to jspsych.js #1472 2021-02-04 13:49:44 -05:00
Josh de Leeuw
cac696c2a2 start docs for extensions 2021-02-04 13:44:27 -05:00
Becky Gilbert
1f16ed1ee6 remove keyCode-related functions from pluginAPI docs #396 2021-02-02 16:15:23 -08:00
Becky Gilbert
bc585ee64a fix minor errors in plugin/parameter descriptions 2021-02-02 15:02:26 -08:00
Becky Gilbert
bc14216254 change all numeric key codes to key strings in docs #396 2021-02-02 12:25:11 -08:00
GEJ1
e2244eecb6 Documentation: screen resize and distance are optional 2021-02-02 15:18:09 -03:00
GEJ1
c9b95d377a Documents: deg data and resize functionalities 2021-02-02 13:03:04 -03:00
GEJ1
69b86ee328 documentation: the last commit was incomplete 2021-02-02 11:45:50 -03:00
GEJ1
637f654961 Documentation completed. Also I added description in some parameters. 2021-02-02 11:26:39 -03: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
GEJ1
1f813bc9f3 documentation update and resize decision (true or false) 2021-01-28 14:56:15 -03: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
Pablo Bernabeu
3e86b0a176
Update style.md
Hello,

I would like to suggest a small expansion of the *initial* explanation about CSS selectors.

No worries if not needed.

Thanks!
2021-01-24 03:19:28 +00:00
Becky Gilbert
188cb14e3d
Merge branch 'master' into feature-css-class-trial 2021-01-18 12:18:43 -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
a496871984 update docs for #883 2021-01-13 10:07:48 -08:00
Becky Gilbert
761491ed94 tweak example HTML file classes and add note about inheritance #832 2021-01-12 14:07:24 -08: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
6aa5641bb5 improve description, fix missing param and incorrect default 2020-12-08 12:46:47 -08:00
Becky Gilbert
444b54e13f fix missing/incorrect defaults, mention response allowed while playing param 2020-12-08 12:32:27 -08:00
Becky Gilbert
c55c2b3592 add link to params available in all plugins 2020-12-08 12:21:54 -08:00
Becky Gilbert
aa7629f6d2 fix formatting and broken link 2020-12-08 11:32:17 -08:00
Becky Gilbert
1c6037f249 update links to CORS section, add message_progress_bar param 2020-12-08 11:30:24 -08:00
Becky Gilbert
9c711416b8 update link to CORS section 2020-12-08 11:28:06 -08:00
Becky Gilbert
4f568a93a3 add manual update example and custom message option 2020-12-08 11:26:42 -08:00
Becky Gilbert
a4e809dac4 fix incorrect plugin order and typo 2020-12-08 11:25:09 -08:00
Becky Gilbert
d87fd2a6cf fix out-of-date links, add links, tweak wording 2020-12-08 11:24:04 -08:00
Becky Gilbert
8c50d15a21 update example labels 2020-12-08 11:22:01 -08:00
Becky Gilbert
d4cf29ca54 fix exclude-browser link 2020-12-08 11:19:15 -08:00
Becky Gilbert
82c0eeafb3 fix typo in localSave link 2020-12-07 13:46:14 -08:00
Becky Gilbert
4f81bc1f57 first draft of running expts page, replaces collecting data page (now the "online" section) 2020-12-07 13:16:47 -08:00
Becky Gilbert
455343c672 ref running experiments page in use_webaudio section, add min RT and override safe mode options 2020-12-07 13:15:14 -08:00
Becky Gilbert
3f8f5fe73f ref running experiments page, update video stimulus param 2020-12-07 13:06:56 -08:00
Becky Gilbert
fbb38b0f01 clarify ovoerride_safe_mode param description 2020-12-04 13:00:30 -08:00
Becky Gilbert
79b5554897 fix incorrect default 2020-12-04 10:14:16 -08:00
Becky Gilbert
a433d81c90 merge in the video parameter name changes from master 2020-12-03 15:43:15 -08:00
Becky Gilbert
63fc69c029 Merge branch 'master' of https://github.com/jspsych/jsPsych 2020-12-03 15:38:48 -08:00
Becky Gilbert
c3dd525bb7 tweak description 2020-12-03 15:32:21 -08:00
Becky Gilbert
e9bf43b29f add new canvas and maxdiff plugins 2020-12-03 15:32:00 -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
Josh de Leeuw
136cc5103c fix #1265 2020-12-03 14:04:37 -05:00
Josh de Leeuw
28b8714c29 fix bullet list 2020-12-03 14:04:20 -05:00
Josh de Leeuw
99e70b6a91 replace logo type 2020-12-03 14:04:08 -05:00
Becky Gilbert
2f73392370 add override_safe_mode parameter to jsPsych.init 2020-12-02 17:42:18 -08:00
Becky Gilbert
d9437c1c11 change sources parameter name to stimulus 2020-12-01 16:56:12 -08:00
Becky Gilbert
528a56c53e
Merge branch 'master' into docs-6.2 2020-11-25 11:51:23 -08:00
Becky Gilbert
32cdeae645
Merge branch 'master' into fix-consecutive-images 2020-11-25 10:50:26 -08:00
Becky Gilbert
bbef9ef9d2
Merge pull request #1203 from jspsych/freesort
Updates to free-sort plugin
2020-11-25 09:48:05 -08:00
Becky Gilbert
347005809a minor tweaks to wording 2020-11-20 15:51:18 -08:00
Becky Gilbert
1aaee22324
Merge pull request #1136 from awhug/master
Add maxdiff plugin
2020-11-20 15:09:39 -08:00
Becky Gilbert
8cc2454cfd add counter text and stim_starts_inside parameters 2020-11-19 18:22:08 -08:00
Becky Gilbert
4c0dab0122 add new border/background color parameters 2020-11-19 16:07:35 -08:00
Becky Gilbert
b1b3e7d973 remove dependency text 2020-11-19 15:43:37 -08:00
Becky Gilbert
7782eb2e3a minor tweaks to wording, remove jQuery dependency 2020-11-19 14:54:19 -08:00
Becky Gilbert
175eaab10d
Merge pull request #1018 from kohler-visual-neuroscience-lab/master
updates to free-sort plugin, new functionality
2020-11-18 17:46:02 -08:00
Becky Gilbert
386e5be719 minor changes for clarity and consistency with other plugins, more examples 2020-11-10 14:05:46 -08:00
Becky Gilbert
ece6e3b57e
Merge pull request #700 from cjungerius/feature/canvas
Add canvas keyboard/button/slider plugins
2020-11-09 15:38:50 -08:00
Becky Gilbert
af8d531259 add render_on_canvas option, fix maintain_aspect_ratio - fixes #891 #969 #1172 2020-11-06 17:55:06 -08:00
Becky Gilbert
dbb001c0c7
Merge branch 'master' into respond-while-playing 2020-11-04 11:27:50 -08:00
Josh de Leeuw
3fc8447fba
minor change at the end 2020-11-02 22:49:20 -05:00
Josh de Leeuw
7861b4471d
Minor changes 2020-11-02 22:44:09 -05:00
Becky Gilbert
7be11b72f4 first draft 2020-10-31 12:46:49 -07:00
Becky Gilbert
abc587184b fix typo 2020-10-30 17:00:43 -07:00
Becky Gilbert
9f3fb74754 initial commit 2020-10-30 16:54:01 -07:00
Becky Gilbert
b02e73ea21 warn about .mov files - #649 2020-10-26 16:58:45 -07:00
Becky Gilbert
6396036c9e add response_allowed_while_playing parameter - #1137 2020-10-26 14:47:30 -07:00
Becky Gilbert
ac5c101c9d add minimum_valid_rt parameter to jspsych.init 2020-10-23 09:05:29 -07:00
Angus Hughes
857db43166 maxdiff response column labels now more generic 2020-10-23 11:05:13 +08:00
Becky Gilbert
b82ee3f6c9
Merge pull request #668 from alisdt/master
note that input to submitToTurk must be non-empty
2020-10-21 14:40:47 -07:00
awhug
1467f3b1e4 Initial pass of maxdiff plugin 2020-10-21 16:08:11 +08:00
Becky Gilbert
6a9f3575b6 update with changes to first/last functions 2020-10-20 16:17:39 -07:00
Becky Gilbert
ee228b1419 change timing_response to trial_duration - #1096 2020-10-12 12:36:21 -07:00
Becky Gilbert
121428cf31 change start param to slider_start 2020-10-11 12:16:39 -07:00
Becky Gilbert
b3effcb015 fix inconsistencies in parameter info 2020-10-11 10:33:01 -07:00
Becky Gilbert
f92b9214b5 fixed inconsistencies in parameter info 2020-10-11 10:26:10 -07:00
Becky Gilbert
66ca55478e fixed broken link 2020-10-10 19:19:24 -07:00
Becky Gilbert
1bc3ac337c
Merge pull request #721 from vijaymarupudi/html5-fix
Removed closing </link> tag
2020-10-08 17:20:25 -07:00
Becky Gilbert
c63d025f05
Merge pull request #694 from kachergis/master
corrected trial type in example
2020-10-08 17:04:00 -07:00
Becky Gilbert
d619ed1d64
Merge pull request #707 from vijaymarupudi/doc-fix
Updated to reflect that video preload is supported
2020-10-08 16:39:22 -07:00
Becky Gilbert
b81193756a changed timing_response to trial_duration 2020-10-02 14:40:45 -07:00
Becky Gilbert
72a0c539e5 add slider start value to data generated 2020-10-02 14:27:39 -07:00
Becky Gilbert
f1c2bd35cf revert docs update that was moved to docs-6.2 branch 2020-10-02 14:15:59 -07:00
Becky Gilbert
dd543cff96 fix typo 2020-10-02 14:13:25 -07:00
Becky Gilbert
09a8a4578e sync with docs changed via PR merged into master 2020-10-02 14:08:52 -07:00
Becky Gilbert
f2b49939da add autocomplete parameter 2020-10-02 14:03:13 -07:00
Becky Gilbert
8e5af0e356 add autofocus parameter and example 2020-10-02 13:56:29 -07:00
Becky Gilbert
bc2809b3f1 remove files that were unintentionally added in PR 2020-10-01 16:58:06 -07:00
Becky Gilbert
55e581fff4 add missing parameters heading and text 2020-10-01 16:55:30 -07:00
Gustavo Juantorena
293338172f Addded page_label to plugin jspsych-instructions also changed docs 2020-09-27 14:07:14 -03:00
Gustavo Juantorena
49f68b7b7e Revert "Addded page_labe to plugin.info also changed docs"
This reverts commit ada7afbf89.
2020-09-27 03:44:35 -03:00
Gustavo Juantorena
ada7afbf89 Addded page_labe to plugin.info also changed docs 2020-09-27 03:05:35 -03:00
Gustavo Juantorena
a96721272d starting the documentation for virtual chin rest plugin 2020-09-25 20:12:13 -03:00
Peter J. Kohler
c2132ab4d7 updated free-sort docs 2020-08-29 17:13:05 -04:00
kachergis
5f2a534748 fixed example trial type in video-button-response plugin 2020-07-10 20:18:15 -07:00
Vijay Marupudi
9c4e26173e Removed closing </link> tag 2020-05-26 20:20:03 -05:00
Vijay Marupudi
752d34e08f Updated to reflect that video preload is supported 2020-05-19 07:33:10 -05:00
Chris Jungerius
251a143adc completed canvas-slider-response documentation 2020-05-11 16:59:48 +02:00
Chris Jungerius
b31f5f5cd4 finished canvas-button-response documentation 2020-05-11 16:34:43 +02:00
Chris Jungerius
c66f74fec4 finished canvas-keyboard-response documentation 2020-05-11 15:30:15 +02:00
Chris Jungerius
f17c0ddb60 started button and slider response docs 2020-05-11 14:55:58 +02:00
Chris Jungerius
9f864f3602 added skeleton documentation for canvas-keyboard-response 2020-05-11 12:06:17 +02:00
kachergis
2358c10e7a corrected trial type 2020-04-20 13:34:41 -07:00
Alexander Robertson
4ddcaba30e
Update jspsych-survey-text.md
The parameter "value" is incorrectly referred to as "placeholder" in the documentation here. I have changed it to reflect what the parameter names actually are.
2020-02-12 14:07:38 +00:00
alisdt
619117391c
Input to submitToTurk must be non-empty 2020-02-05 10:56:31 +00:00
Josh de Leeuw
ef5b1f53ff minor docs updates 2019-07-16 11:39:39 -04:00
Josh de Leeuw
83f3a17024 docs tweaks 2019-07-15 16:39:27 -04:00
Josh de Leeuw
e714214fc4 check TOC; make necessary changes #617 2019-07-15 14:55:36 -04:00
Josh de Leeuw
5a56431f8d add name option for survey plugins #608 2019-07-15 12:06:10 -04:00
Josh de Leeuw
c83e115f9b add name option to survey-text #608 2019-07-15 10:54:26 -04:00