616 Commits

Author	SHA1	Message	Date
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
Pablo Bernabeu	c55648a12e	Fixed typo in media-preloading.md ... Fixed typo (`timline`) in media-preloading.md	2021-01-27 03:15:01 +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
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