HoshinoKoji/jsPsych
1
0
Fork 0
mirror of https://github.com/jspsych/jsPsych.git synced 2025-05-12 08:38:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,325 Commits 14 Branches 506 Tags 58 MiB
d8b80fbe0e
Commit Graph

616 Commits

Author SHA1 Message Date
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
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
Josh de Leeuw
4c5c4af92c adding documentation for #636 2019-07-15 10:25:06 -04:00
Josh de Leeuw
6cf949766a adding documentation for video plugins #636 2019-07-12 17:02:06 -04:00
Josh de Leeuw
68d8c40ea6 remove old video plugin #636 2019-07-12 11:39:20 -04:00
Josh de Leeuw
c126b58f0a implement scale_width #633 2019-07-11 10:29:47 -04:00
Josh de Leeuw
b4ca37be1c implement experiment_width #572 2019-07-11 10:21:50 -04:00
Josh de Leeuw
d120b3b470 implement alternating groups sample method (#528) 2019-07-08 21:53:40 -04:00
Josh de Leeuw
208ecf0365 some minor tweaks to survey-html-form plugin 2019-07-04 15:24:37 -04:00
Josh de Leeuw
7d01510a24
Merge pull request #602 from jansim/master 
Added very simple alternative jspsych-survey-html-form plugin
 2019-07-04 15:19:13 -04:00
Josh de Leeuw
9bed32fb0f implements settable width for sliders (#631) 2019-07-04 15:10:52 -04:00
Josh de Leeuw
338b3d5351 add docs for #573 2019-07-03 12:27:30 -04:00
Josh de Leeuw
381d2778b1 Merge branch 'pr/575' 2019-07-02 22:15:50 -04:00
Josh de Leeuw
9da8c452f2 implement image size settings for image plugins #560 2019-07-02 21:55:15 -04:00
Josh de Leeuw
45a307f4d5 mturk doc update - thanks @kachergis! 2019-07-02 17:31:37 -04:00
Josh de Leeuw
c480d17743 update docs for #629 2019-07-02 16:41:34 -04:00
Josh de Leeuw
fd52dcb481 change examples to use placeholder #627 2019-07-02 11:08:46 -04:00
Josh de Leeuw
cd82ddfc1d implements #627 2019-07-02 11:06:41 -04:00
Josh de Leeuw
e80ea04b04 working on randomization of survey orders #305 2019-07-01 13:33:07 -04:00
Josh de Leeuw
29645d540c add docs for randomize_question_order (#305) 2019-06-20 09:37:09 -04:00
Josh de Leeuw
fd3c15c8ce implementing random order for survey-likert (#305) 2019-06-19 17:03:27 -04:00
Josh de Leeuw
89e9023460 update docs re: preloading audio (#524) 2019-06-04 13:52:50 -04:00
Josh de Leeuw
86e381c96b Merge branch 'master' of https://github.com/jspsych/jsPsych 2019-06-04 11:02:27 -04:00
Josh de Leeuw
3137eaaf13 add documentation of timelineVariable(..., true) (#607) 2019-06-04 11:02:19 -04:00
Josh de Leeuw
8eb344fbf1
Merge pull request #609 from retowyss/patch-1 
Enable language option for progress bar
 2019-06-03 16:47:16 -04:00
Josh de Leeuw
627b4b2d50
Merge pull request #555 from sprengholz/master 
Cloze Test
 2019-05-31 16:46:53 -04:00
Josh de Leeuw
e5c1c85eaf documentation for #604 2019-05-24 11:27:25 -04:00
Reto Wyss
51155ea3ba
document progress bar message 2019-04-13 02:39:35 +02:00
Jan Simson
40d50e89a2 html-form-plugin: Return JS Object instead of JSON String 2019-04-04 10:43:57 -04:00
Jan Simson
5462dc200d Added test & basic documentation for jspsych-surve-html-form plugin 2019-03-20 15:27:57 -04:00
alisdt
4651b5d3c2
Replace jQuery in example with vanilla JS 2019-02-04 12:21:36 +00:00
Robert Gibboni
560a655c64 option to set video playback rate 2019-01-23 15:23:25 -08:00
Zhanwen "Phil" Chen
fc7f7cc9e8
Update jspsych-same-different-image.md 
Type "same-different" is undefined.
 2019-01-05 11:05:46 -06:00
Josh de Leeuw
0fcc566228 fix formatting bug #578 2018-11-30 14:48:57 -05:00
Sivananda Rajananda
e49ba9d0ab
Rename jspsych-RDK.md to jspsych-rdk.md 2018-11-27 16:36:27 -08:00
CML2
dd64b0a00e changed RDK to lowercase 2018-11-27 16:26:32 -08:00
CML2
8408f59746 Changed to lowercase rdk and fixed border bug 2018-11-27 16:19:53 -08:00
Josh de Leeuw
8c5d83b258 implement required parameter for survey-text plugin (#460) 2018-11-09 14:10:09 -05:00
Josh de Leeuw
d27f52618f update docs for video preload 2018-10-12 11:58:01 -04:00
Josh de Leeuw
501a5be52a update all to performance.now() - #492 2018-10-09 16:13:59 -04:00
Josh de Leeuw
0c4080fe81 update progress bar docs #538 2018-10-09 13:26:55 -04:00
Josh de Leeuw
6a6d390cb8 add get of progress bar value (#538) 2018-10-09 13:21:53 -04:00
Josh de Leeuw
59258d3215 implements #324 -- beforeunload event handler 2018-10-09 13:12:07 -04:00
Josh de Leeuw
540ce2ed6f step version 2018-10-04 15:31:37 -04:00
CML2
3d708804b2 changed timing_post_trial to post_trial_gap 2018-09-20 13:31:55 -07:00
CML2
7a5c980cbf Added functionality for RDK to take in javascript character codes for choices and correct_choice parameters 2018-09-07 17:07:00 -07:00
Josh de Leeuw
c2bf4bb0aa fix title of plugin doc 2018-08-24 13:52:06 -04:00
Philipp Sprengholz
53321cb9d5 Reworked documentation, added test file 2018-08-05 12:25:34 +02:00
Philipp Sprengholz
73c0f24be4 Simplified cloze plugin design 2018-08-02 07:20:47 +02:00
Josh de Leeuw
0b5b3004de implement async option for call-function plugin #552 2018-07-31 10:48:54 -04:00
Josh de Leeuw
9accc0f060 patch documentation issue 2018-07-16 12:14:09 -04:00
Philipp Sprengholz
72c84130c5 Refined the cloze structure and added both example and doc files 2018-07-13 23:15:38 +02:00
Josh de Leeuw
b9a796211e step version 2018-06-25 22:10:58 -04:00
Josh de Leeuw
25d23a8e0d adding RDK plugin 2018-06-25 22:08:47 -04:00
Josh de Leeuw
fe29d2b255
Merge pull request #491 from vrsivananda/add-RDK 
Added RDK plugin
 2018-06-25 22:02:19 -04:00
Josh de Leeuw
fe74cdefbf update docs for #537 2018-06-25 21:48:57 -04:00
Josh de Leeuw
b6009b2de9 docs for #532 2018-06-25 21:37:32 -04:00
Josh de Leeuw
a6a012009c update docs on localSave 2018-06-25 14:23:11 -04:00
Josh de Leeuw
b15261c09c
Merge pull request #530 from spencerking/master 
Fixing issue #261
 2018-06-25 14:19:18 -04:00
Josh de Leeuw
3a3a792fed fix two typos in docs 2018-05-30 13:23:02 -04:00
Sivananda Rajananda
10608969b7 Fixed multiple apertures nSets parameter and function 2018-05-22 11:35:51 -04:00
Spencer King
aa3df3591f Fixing issue #261 
localSave() is now supported by Safari
 2018-05-16 22:12:05 -05:00
Josh de Leeuw
8678eed304 did not work 2018-05-14 23:02:33 -04:00
Josh de Leeuw
b7dd6ce0c8 try adding gitignore to docs for autobuild? 2018-05-14 23:01:08 -04:00
Josh de Leeuw
6173928409 step version in docs 2018-05-14 22:27:43 -04:00
CML2
7d5910f569 Fixed doc for RDK 2018-05-09 15:05:09 -07:00
Josh de Leeuw
c14b0f1d76 fix links to slider plugins 2018-04-20 09:02:03 -04:00
Josh de Leeuw
c6c4eff79f fix typo in rt tutorial 2018-04-18 21:09:06 -04:00
Josh de Leeuw
1035b0f503 update version 2018-04-17 21:47:25 -04:00
Josh de Leeuw
b4a0ce33e6 fix docs, make callback optional #513 2018-04-17 10:43:37 -04:00
Josh de Leeuw
810df6c182 fix minor errors; step version #516 2018-04-17 10:38:34 -04:00
CML2
7b444afd59 Added multiple apertures and opposite coherence 2018-04-04 16:23:03 -07:00
Jon Gauthier
4a0ef29c07
Fix title 2018-02-28 10:39:19 -05:00
Josh de Leeuw
c1e7442f6c
Merge pull request #505 from yulkang/master 
corrected a typo in the rt-task tutorial regarding tagging
 2018-02-18 22:28:34 +01:00
Josh de Leeuw
97d5b53c26
Merge pull request #507 from VorontsovIE/survey_text_bug 
default values in survey-text are now specified not in arrays
 2018-02-18 22:27:31 +01:00
Josh de Leeuw
2c172a1caf add a small delay between preload reattempts, documentation #503 2018-02-18 16:24:04 -05:00
Josh de Leeuw
f3d5a5043d make webaudio optional #508 2018-02-18 16:19:09 -05:00
Ilya Vorontsov
ac98f87d06 default values in survey-text are now specified not in arrays 2018-02-17 00:36:32 +03:00
YulKang
788c864da8 corrected a typo in rt-task tutorial regarding tagging (colon was missing after "correct_response") 2018-02-15 15:34:04 +00:00
Josh de Leeuw
d693d34d05 update docs to clarify #499 2018-02-08 13:51:40 -05:00
Josh de Leeuw
bffbb67636 getData() -> get() 2018-01-12 14:04:37 -05:00
Josh de Leeuw
a4a9a97854 update docs for 6.0.1 2018-01-11 10:18:51 -05:00
Josh de Leeuw
4d6b8a7f38 prep 6.0.1 2018-01-11 10:17:44 -05:00
Josh de Leeuw
fd77ed9f48 update docs 2018-01-11 10:15:25 -05:00
Sivananda Rajananda
e2a028f862 Added RDK plugin 2018-01-10 14:23:08 -08:00
Josh de Leeuw
e7b6b919a9 update docs config, icon 2018-01-08 12:18:25 -05:00
Josh de Leeuw
bdffecf038 features -> overview 2018-01-03 16:01:34 -05:00
Josh de Leeuw
d65bbe0ffe update docs location structure 2018-01-03 15:58:30 -05:00
Josh de Leeuw
dee50c29be switching theme, updating docs 2018-01-03 15:35:57 -05:00
Josh de Leeuw
2857a9022e remove docs ref to xab 2018-01-03 14:16:02 -05:00
Josh de Leeuw
6abdd01d7e remove XAB plugin 2018-01-03 14:05:11 -05:00
Josh de Leeuw
f7966aeaf1 implements #489 2018-01-03 13:57:20 -05:00
Josh de Leeuw
9d3cfb65c8 adjusting docs for #488 2018-01-03 12:25:39 -05:00
Josh de Leeuw
97467a1f0d fixing bad default values to more descriptive ones #488 2018-01-03 12:02:10 -05:00
Josh de Leeuw
a34757ed0f minor doc update 2018-01-02 23:26:56 -05:00
Josh de Leeuw
71172ff551 docs updates 2018-01-02 22:49:20 -05:00
Josh de Leeuw
71d4ea8a50 docs updates 2018-01-02 22:26:11 -05:00
Josh de Leeuw
c93ce02e1b docs updates 2018-01-02 18:50:35 -05:00
Josh de Leeuw
4ae3605174 docs update 2018-01-02 15:17:15 -05:00
Josh de Leeuw
a397d3eb2a update exclusion docs #487 2018-01-02 15:01:49 -05:00
Josh de Leeuw
4a1dbca8e1 update docs 2018-01-02 14:56:26 -05:00
Josh de Leeuw
9ef744a51d doc updates 2018-01-01 22:35:51 -05:00
Josh de Leeuw
ca3328ec82 some more docs updates 2018-01-01 22:12:41 -05:00
Josh de Leeuw
d9455ed2c0 updating plugin documentation 2017-12-30 23:35:37 -05:00
Josh de Leeuw
c3438c5f20 e.g. --> e.g., 
yay grammar
 2017-12-29 21:51:06 -05:00
Josh de Leeuw
900ddd1545 fixes #484 2017-12-29 15:30:52 -05:00
Josh de Leeuw
a5bdbe3360 add docs for #486 2017-12-29 15:27:04 -05:00
Josh de Leeuw
2690355e4f removing refs to text plugin 2017-12-20 13:12:17 -05:00
Josh de Leeuw
3fe0f803d7 fix plugin listing in docs 2017-12-20 13:08:26 -05:00
Josh de Leeuw
db6c50cb70 update overview page 2017-12-20 12:44:14 -05:00
Josh de Leeuw
676371e4ec fixing old documentation 2017-12-20 11:48:18 -05:00
Josh de Leeuw
5ebfddd14d docs update for #483 2017-12-20 11:25:32 -05:00
Josh de Leeuw
a36fb9cd2c docs update 2017-12-11 19:55:21 -05:00
Josh de Leeuw
336ddca138 document #483 2017-12-08 21:17:39 -05:00
Josh de Leeuw
0e9d90fe3c doc updates 2017-12-08 21:13:48 -05:00
Josh de Leeuw
fd78450ecf remove audio buffer time, fixes #476 2017-12-06 12:57:15 -05:00
Josh de Leeuw
3affd77ddf button label defaults #471 2017-09-20 09:37:29 -04:00
Josh de Leeuw
09ad9296c4 update grid-scene docs and demo 2017-09-14 22:27:55 -04:00
Josh de Leeuw
3c6f9a445a remove is_html 2017-09-12 12:54:58 -04:00
Josh de Leeuw
e687f88e87 update tutorial content for new plugins 2017-09-12 12:42:38 -04:00
Josh de Leeuw
fa643fd275 update hello-world tutorial 2017-09-12 12:32:19 -04:00
mariansauter
2d86ac5506 fixed variable error 2017-09-08 14:42:17 +02:00
kristiyip
d342b059e3 Update jspsych-survey-text.md 2017-07-28 10:18:26 -04:00
kristiyip
582d9cb6d2 Update jspsych-survey-multi-select.md 2017-07-28 10:14:36 -04:00
kristiyip
e4b3f62596 Update jspsych-survey-multi-choice.md 2017-07-28 10:03:11 -04:00
kristiyip
7f684055e1 Update jspsych-survey-likert.md 2017-07-28 09:54:55 -04:00
KristinDiep
7a0b02993a survey-likert doc 2017-07-28 09:53:50 -04:00
KristinDiep
5df6166473 Update survey plugin docs 2017-07-27 14:59:32 -04:00
Josh de Leeuw
eeaa2bba29 remove class=center-content 2017-07-17 21:45:32 -04:00
kristiyip
65e41900a0 Delete jspsych-xab.md 2017-07-14 14:33:52 -04:00
kristiyip
4debc6b4f7 Create jspsych-xab-image.md 2017-07-14 14:33:40 -04:00
kristiyip
7238812a87 Create jspsych-xab-html.md 2017-07-14 14:32:56 -04:00
kristiyip
4a934778fd Update jspsych-vsl-animate-occlusion.md 2017-07-14 14:14:22 -04:00
kristiyip
1e1a61a53c Update jspsych-visual-search-circle.md 2017-07-14 14:11:58 -04:00
kristiyip
c9d94ec1e8 Delete jspsych-text.md 2017-07-14 14:09:02 -04:00
kristiyip
3c0f557d13 Update jspsych-survey-multi-select.md 2017-07-14 14:07:45 -04:00
kristiyip
2f2c7e4dbc Update jspsych-survey-multi-choice.md 2017-07-14 14:06:31 -04:00
kristiyip
83cfc22c39 Update jspsych-survey-likert.md 2017-07-14 14:05:24 -04:00
kristiyip
a63e1e2215 Delete jspsych-single-stim.md 2017-07-14 14:03:47 -04:00
kristiyip
21a6a6e6f6 Delete jspsych-single-audio.md 2017-07-14 14:03:37 -04:00
kristiyip
677d3501d1 Update jspsych-serial-reaction-time.md 2017-07-14 14:03:18 -04:00
kristiyip
2093ec74cb Update jspsych-serial-reaction-time-mouse.md 2017-07-14 14:00:58 -04:00
kristiyip
75d6c8d97e Delete jspsych-same-different.md 2017-07-14 13:55:04 -04:00
kristiyip
f387b74480 Create jspsych-same-different-image.md 2017-07-14 13:54:49 -04:00
kristiyip
f7420f1b01 Create jspsych-same-different-html.md 2017-07-14 13:53:06 -04:00
kristiyip
fa559499b8 Delete jspsych-multi-stim-multi-response.md 2017-07-14 13:46:01 -04:00
kristiyip
b94290904a Create jspsych-image-slider-response.md 2017-07-14 12:14:34 -04:00
kristiyip
12b9c61df3 Create jspsych-image-keyboard-response.md 2017-07-14 12:12:38 -04:00
kristiyip
3455c0e4da Create jspsych-image-button-response.md 2017-07-14 12:10:56 -04:00
kristiyip
fd20c0b700 Create jspsych-html-slider-response.md 2017-07-14 12:07:39 -04:00
kristiyip
c8caf2f0ea Create jspsych-html-keyboard-response.md 2017-07-14 12:04:59 -04:00