2202 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Becky Gilbert	10aa0f64e2	add docs for on_timeline_start and on_timeline_finish	2021-02-09 12:47:16 -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
Josh de Leeuw	0e709cf8e0	remove console.log	2021-02-05 10:55:36 -05:00
Josh de Leeuw	bb26dc461c	don't call preload methods if no files to load	2021-02-05 10:36:11 -05:00
Josh de Leeuw	7dbcfea7da	add a test to ensure loop function runs only once with TVs #585	2021-02-04 21:53:55 -05:00
Josh de Leeuw	8dd61e6bed	conditional_function only runs with first set of variables #585	2021-02-04 21:50:23 -05:00
Josh de Leeuw	9da9f4eaf0	the broken test should resolve when we merge in changes from feature-timeline-events branch	2021-02-04 21:41:49 -05:00
Becky Gilbert	7618bc3cbb	add case_sensitive_responses parameter to docs #396	2021-02-04 17:43:00 -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
Josh de Leeuw	21e7fa34c1	add version info to jspsych.js #1472	2021-02-04 13:49:44 -05:00
Becky Gilbert	278668d048	change keyCode to key in keyboard event passed to dispatchEvent	2021-02-03 11:19:46 -08:00
Becky Gilbert	13c39d29f6	fix typo	2021-02-03 11:17:18 -08:00
Becky Gilbert	bce6c030a7	minor edit to console.warn messages	2021-02-03 09:52:24 -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	1f16ed1ee6	remove keyCode-related functions from pluginAPI docs #396	2021-02-02 16:15:23 -08:00
Becky Gilbert	72af0b870f	add console.warn to pluginAPI keyCode functions	2021-02-02 16:10:45 -08:00
Becky Gilbert	bc585ee64a	fix minor errors in plugin/parameter descriptions	2021-02-02 15:02:26 -08:00
Becky Gilbert	41bc9d725e	switch to only using strings for keyboard keys, change keyboard key parameter types/defaults, remove compareKeys fn #396	2021-02-02 15:01:38 -08:00
Becky Gilbert	9ea3c6517a	change KEYCODE parameter type to KEY #396	2021-02-02 12:30:15 -08:00
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
Becky Gilbert	56abce0a2f	revert webgazer commits #396	2021-01-29 17:42:16 -08:00
Becky Gilbert	665b0ce9fa	finish adding/fixing tests #1351	2021-01-29 16:22:50 -08:00
Josh de Leeuw	7c14e31126	fix nested timeline test #1351	2021-01-29 17:30:47 -05:00
Becky Gilbert	bc39856bec	add preload tests (not finished yet), nested timeline test fails #1351	2021-01-29 09:48:38 -08:00
Becky Gilbert	87cde65fce	add cancelPreloads calls, fix logic, load all media types regardless of loading failures #1351	2021-01-28 16:10:39 -08:00
Becky Gilbert	12bdd82b91	store preload requests and add pluginAPI.cancelPreloads function, fix 404 error logging for webaudio and video #1351	2021-01-28 16:06:53 -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	8279cba460	switch to file load/error callbacks, improve logic, add detailed errors, add success/error callback params, add param descriptions #1351	2021-01-27 16:33:39 -08:00
Becky Gilbert	692b3cbfa2	change preload callback functions so that they return file name and error, rather than load count #1351	2021-01-27 16:28:24 -08:00
Josh de Leeuw	1caecc6bf9	fixes protection of nested function params, adds test	2021-01-27 11:47:54 -05: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