Commit Graph

61 Commits

Author SHA1 Message Date
Josh de Leeuw
ef64d1389b handle undefined params in enforceArray 2014-06-29 10:48:02 -04:00
Josh de Leeuw
6d08b3ce86 add turk module 2014-06-29 09:26:01 -04:00
Josh de Leeuw
133ce33c3b create dataAPI 2014-06-28 22:10:07 -04:00
Josh de Leeuw
dc4afd50bd add option to persist a keyboard listener 2014-06-28 10:51:54 -04:00
Josh de Leeuw
119c94ca5b move keycode 2014-06-27 23:02:10 -04:00
Josh de Leeuw
2d586bbaa6 move functions into pluginAPI module 2014-06-27 23:00:48 -04:00
Josh de Leeuw
5e85c7025b check to make sure listener exists before removing 2014-06-26 11:48:23 -04:00
Josh de Leeuw
511279df42 add ability to cancel getKeyboardResponse listeners 2014-06-26 11:41:41 -04:00
Josh de Leeuw
0eea72adb1 add factorial method, rename simpleSample to repeat 2014-06-25 13:31:58 -04:00
Josh de Leeuw
f3a514a20b add randomization module
* includes simpleSample method and a few private helper functions
2014-06-25 12:27:03 -04:00
Josh de Leeuw
5880398058 allow key string lookup 2014-06-25 08:58:06 -04:00
Josh de Leeuw
b913c7c9d0 bug fix in getKeyboardResponse 2014-06-24 18:34:44 -04:00
Josh de Leeuw
85ea030ed0 wrong logical operator 2014-06-24 16:59:39 -04:00
Josh de Leeuw
ba64349cb5 Adding getKeyboardResponse method to core 2014-06-24 14:10:16 -04:00
Josh de Leeuw
8d2211b712 Add error message if plugin is not loaded
Closes #51
2014-06-24 12:07:57 -04:00
Josh de Leeuw
12c527e0b4 typo fix in core.submitToTurk 2014-06-16 09:44:51 -04:00
Josh de Leeuw
ebfc6548f6 Add core.submitToTurk
* add function to core
* modify turkInfo to also grab turkSubmitTo location (either sandbox or production)
2014-06-15 12:56:03 -04:00
Josh de Leeuw
decd0cf04b add jsPsych.totalTime method
gets the total time in ms since the experiment started.
2014-06-11 23:15:17 -04:00
Josh de Leeuw
b3b82db7f8 add class information to display element
related to issue #45
2014-06-11 16:10:35 -04:00
Josh de Leeuw
c0beee3221 handle multiple parameters with single call of enforce array 2014-05-19 10:42:14 -04:00
Josh de Leeuw
c5539da1a6 Merge branch 'master' into smart-arrays
Conflicts:
	jspsych.js
2014-05-19 10:05:58 -04:00
Josh de Leeuw
ab6c105dd1 make sure unprocessed functions get preserved in trial obj
related to issue #42
2014-05-15 14:25:33 -04:00
Josh de Leeuw
a8f2a676e6 Allow for protected variables in normalizeTrialVariables
Related to #43
2014-05-14 15:13:04 -04:00
Josh de Leeuw
c88c07887c PreloadImages method will auto-flatten the input array
Closes #42
2014-05-13 13:02:47 -04:00
Josh de Leeuw
75dc0e8b57 Adding enforceArray method 2014-04-28 16:47:15 -04:00
Josh de Leeuw
c8cb4204d1 adding normalizeTrialVariables method
method takes an object (intended to be a trial data structure) and converts any function arguments to their returned value.
2014-03-03 10:41:24 -05:00
Josh de Leeuw
1a3ca8cc69 Add option to return flattened data object
Related to issue #31 because it moves a utility function into the core library.
2014-02-28 17:07:07 -05:00
Josh de Leeuw
99e7cb58ba Adding an extra value for identifying when page is loaded outside of Turk context (relevant to #10) 2013-11-21 15:08:20 -05:00
Josh de Leeuw
b6a89b935c Adding jsPsych.turkInfo() method (addresses issue #10) 2013-11-20 15:07:32 -05:00
Josh de Leeuw
a04f33f30e adding core.preloadImages() 2013-11-11 23:09:21 -05:00
Josh de Leeuw
1f173bcea4 tweaking saveAstext 2013-11-09 19:59:27 -05:00
Josh de Leeuw
d28108d175 tweaking saveAstext 2013-11-09 19:51:45 -05:00
Josh de Leeuw
68a7b64c66 tweaking saveAstext 2013-11-09 19:49:25 -05:00
Josh de Leeuw
61b4a07fa6 bug fix savecsv to file 2013-11-09 17:07:33 -05:00
Josh de Leeuw
fa447f0f52 bug fix savecsv to file 2013-11-09 17:05:29 -05:00
Josh de Leeuw
9bb65c1f1b bug fix savecsv to file 2013-11-09 17:01:03 -05:00
Josh de Leeuw
c820e18f7c adding save CSV to disk option in core library 2013-11-09 16:47:30 -05:00
Josh de Leeuw
260de7bbff fixing a bug in the CSV method 2013-11-07 18:55:49 -05:00
Josh de Leeuw
8da176ec73 adding CSV data option to core library 2013-11-07 18:49:58 -05:00
Josh de Leeuw
9e5c7d73f9 bug fix core - adding root document element addition by default 2013-11-04 10:36:05 -05:00
Josh de Leeuw
f671d6f8da bug fix core 2013-10-26 22:43:46 -04:00
Josh de Leeuw
1facd91a9b changing how display_element is set in the core library 2013-10-24 16:26:26 -04:00
Josh de Leeuw
94af5d0d7b minor typo fix jspsych.js 2013-10-22 12:44:45 -04:00
Josh de Leeuw
f50a579834 add on_data_update callback function to core 2013-10-21 18:00:26 -04:00
Josh de Leeuw
c33eec8724 add on_data_update callback function to core 2013-10-21 18:00:13 -04:00
Josh de Leeuw
d5598e3fff v1.08
- added adaptive category training
- categorize multi and samedifferentloc are incomplete and untested
- fixed issue with core file that caused failure when init method was
called twice.
2013-01-14 11:01:14 -05:00
Josh de Leeuw
fc6321de8a minor commenting 2012-09-06 16:35:05 -04:00
Josh de Leeuw
871ba7a897 added jspsych-free-sort
free sort is a plugin that displays a set of stimuli and records the
movements that participants make as they drag the stimuli to sort them.
sorting is unconstrained (i.e. there are no specific groups that
participants are told to sort into).
2012-07-19 14:18:50 -04:00
Josh de Leeuw
2f0d6c7e1e bug fix - moved where on_trial_finish is called to ensure it is called at the end of every trial 2012-07-17 18:49:46 -04:00
Josh de Leeuw
946f1aeea0 bug fixes for callback methods in previous commit 2012-07-17 18:13:52 -04:00