232 Commits

Author	SHA1	Message	Date
Becky Gilbert	c8298e226f	merge master into preload plugin branch and fix merge conflict	2021-02-09 10:57:46 -08: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	711504887f	add case_sensitive_responses option to jsPsych.init, add tests and example #396	2021-02-04 17:31:51 -08:00
Becky Gilbert	13c39d29f6	fix typo	2021-02-03 11:17:18 -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	56abce0a2f	revert webgazer commits #396	2021-01-29 17:42:16 -08:00
Becky Gilbert	f9b22f040a	tweak preload example file, add comments #1351	2021-01-28 15:58:38 -08:00
Becky Gilbert	cd5f693a78	tweak examples, add console logs in on_success on_error params #1351	2021-01-27 16:36:09 -08:00
Becky Gilbert	44b5b478e5	add preload example file	2021-01-19 17:00:19 -08:00
Josh de Leeuw	6afe9ce086	fixes #1380	2021-01-19 16:51:43 -05: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	4203a047f7	minor tweak to example	2021-01-15 15:42:05 -08:00
Josh de Leeuw	b78efaac73	adding a validation accuracy metric	2021-01-14 15:33:41 -05:00
Becky Gilbert	9147a2dce5	use css_classes parameter instead of inline style for stim size #832	2021-01-13 12:02:54 -08:00
Becky Gilbert	62ab659981	add examples with specific CSS selectors, fix note about inheritance #832	2021-01-13 11:53:53 -08:00
Becky Gilbert	5c653f4bde	remove uncessary true argument from jsPsych.timelineVariable in examples/tests #883	2021-01-13 10:08:38 -08:00
Josh de Leeuw	42f54f0fb3	tweaking calibration and validation scripts	2021-01-13 09:47:11 -05:00
Josh de Leeuw	b146037af3	calibration + validation sort of working...	2021-01-12 17:52:41 -05: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
Josh de Leeuw	562e993f9c	adding a calibration routine, but it's not great	2021-01-02 17:20:21 -05:00
Josh de Leeuw	0ac9fc0d5a	add event hooks in jspsych.js	2021-01-02 13:55:50 -05:00
Josh de Leeuw	26a70adc05	filling out extension code	2021-01-02 13:44:28 -05:00
Josh de Leeuw	9c22731413	begin working on webgazer extensions	2021-01-01 21:26:03 -05:00
Becky Gilbert	e9d632cfc2	add example with custom button and page labels#	2020-12-08 15:13:36 -08:00
Becky Gilbert	f795f29cc9	add info to prompts, add post_trial_gap	2020-12-08 15:02:30 -08:00
Becky Gilbert	3d77e2f131	fix incorrect text_answer	2020-12-08 14:50:51 -08:00
Becky Gilbert	c026c62ea0	move img width from <style> to param	2020-12-08 14:44:24 -08:00
Becky Gilbert	a20d6f9e04	move img width from <style> to param, add pre_trial text	2020-12-08 14:40:03 -08:00
Becky Gilbert	5fc38b2a04	fix typo and formatting, remove unnecessary <style>	2020-12-08 14:22:10 -08:00
Becky Gilbert	fd8a048139	move img width from <style> to param	2020-12-08 14:18:32 -08:00
Becky Gilbert	887dcbd627	move img width from <style> to parameter	2020-12-08 14:13:09 -08:00
Becky Gilbert	633682b335	center the color divs in prompts	2020-12-07 16:14:22 -08:00
Becky Gilbert	d75717ac5b	remove use_webaudio: false from audio examples	2020-12-02 17:46:13 -08:00
Becky Gilbert	4f06465ba3	fix indentation	2020-12-02 17:11:04 -08:00
Becky Gilbert	d9437c1c11	change sources parameter name to stimulus	2020-12-01 16:56:12 -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	1aaee22324	Merge pull request #1136 from awhug/master ... Add maxdiff plugin	2020-11-20 15:09:39 -08:00
Becky Gilbert	a7bed07cf4	add examples to demo new parameters	2020-11-19 18:25:48 -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
Peter J. Kohler	a1ca6a8406	fixed above/below	2020-11-18 19:41:43 -05:00
Becky Gilbert	c367531d40	initial commit	2020-11-10 14:06:47 -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
Becky Gilbert	879f6a7cb5	fix problem with non-zero video start time in FF	2020-10-31 15:37:27 -07:00