Josh de Leeuw
12118247b1
add progress bar option
...
Can now pass ‘show_progress_bar: true’ to init method to display a
progress bar throughout the experiment.
* default styling has been added to jspsych.css for the progress bar
* bug fixes to jspsych.progress method to support this change (bug was
related to getting progress after experiment had ended)
* improved logic for when on_finish_trial callback function will trigger
2014-09-10 10:15:13 -04:00
Josh de Leeuw
2c33d7603d
add block_index to default data
...
records the index of the current block
2014-09-09 08:32:12 -04:00
Josh de Leeuw
146d1dae20
add time_elapsed to default data
...
records the number of ms since the start of the experiment when a trial ends.
2014-09-09 08:28:52 -04:00
Josh de Leeuw
8db4ea307e
add default data for all trials
...
records default data for all trials:
- trial type
- trial index within the block
- trial index for entire experiment (global index -- related to issue #63 )
2014-09-08 15:22:17 -04:00
Josh de Leeuw
a07f59d323
namespace bug
2014-09-03 14:19:24 -04:00
Josh de Leeuw
26052c22a1
remove append_data
2014-07-10 12:14:05 -04:00
Josh de Leeuw
fdf77c79dd
make json pretty
2014-07-10 12:03:51 -04:00
Josh de Leeuw
fc16067939
add getter method for DOM_target, update module methods
2014-07-10 12:00:56 -04:00
Josh de Leeuw
8d3d9af0db
bug fix flatten_data -> flattenData
2014-07-10 11:49:40 -04:00
Josh de Leeuw
594be10e52
add dataAPI.displayData
2014-07-10 11:45:01 -04:00
Josh de Leeuw
959447be1e
move flatten function
2014-07-04 16:04:36 -04:00
Josh de Leeuw
3e8fb4f780
change header doc
2014-07-01 11:08:48 -04:00
Josh de Leeuw
11f644f6a6
add dataAPI.getTrialsOfType
2014-07-01 11:05:40 -04:00
Josh de Leeuw
107ca90748
a few unrelated bug fixes
2014-06-30 14:19:51 -04:00
Josh de Leeuw
ebd50e7726
replace core with module
2014-06-30 09:47:23 -04:00
Josh de Leeuw
e656894011
move getKeys to the right module
2014-06-30 09:46:32 -04:00
Josh de Leeuw
3b184648fd
missing )
2014-06-30 09:43:47 -04:00
Josh de Leeuw
2befa81411
change $.unbind to $.off
2014-06-30 09:36:33 -04:00
Josh de Leeuw
94446016ae
require key to be released before continuing in getKeyboardResponse
2014-06-30 09:33:12 -04:00
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
