Josh de Leeuw
5880398058
allow key string lookup
2014-06-25 08:58:06 -04:00
Josh de Leeuw
46bd26ed84
use getKeyboardResponse
2014-06-24 18:42:00 -04:00
Josh de Leeuw
9469335344
a few small bugs
2014-06-24 18:35:30 -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
f5bdd16095
update to work with new centralized keyboard response method
2014-06-24 14:28:56 -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
eaf6219fa5
update data saving to block.writeData
2014-06-19 15:36:24 -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
4d5d5b7217
Update README.md
2014-05-22 09:11:05 -04:00
Josh de Leeuw
d86c82f707
Merge pull request #47 from jodeleeuw/smart-arrays
...
Smart arrays
2014-05-21 13:31:42 -04:00
Josh de Leeuw
1f0df1f80e
allow for text and data to be non-arrays for single trial block
...
issue #24
2014-05-19 10:44:02 -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
efed8009a1
delete files - from master merge
2014-05-19 10:06:21 -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
d3d6acc4d8
remove variables option
...
issue #44
2014-05-18 11:55:19 -04:00
Josh de Leeuw
3f25eac294
removing dev folder from master branch. see branch plugin-dev-old for recovery.
2014-05-15 14:48:40 -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
55ebe2f413
protect check_fn in normalizeTrialVariables
2014-05-14 15:14:08 -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
b84df35eb0
Remove normalize trial variables method
...
This is a bad idea for this plugin, since check_fn is a function. Need to figure out a way to protect variables like this one. For now, just revert to no functions as trial variables for this plugin.
2014-05-14 12:50:23 -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
8267154774
change default option for choices parameter
2014-05-01 13:58:32 -04:00
Josh de Leeuw
e8b11ed94c
Add response collection option
...
Record RT since the appearance of the sequence item.
2014-05-01 13:51:59 -04:00
Josh de Leeuw
75dc0e8b57
Adding enforceArray method
2014-04-28 16:47:15 -04:00
Josh de Leeuw
7d5738aee7
Update README.md
2014-04-03 09:21:05 -04:00
Josh de Leeuw
ae98dd029f
Update README.md
2014-04-01 11:15:20 -04:00
Josh de Leeuw
d2abf5edd4
Update README.md
2014-03-31 11:01:32 -04:00
Josh de Leeuw
8282cb3d44
add citation
2014-03-31 10:53:47 -04:00
Josh de Leeuw
8bb2b4678d
Merge pull request #38 from jodeleeuw/function-variables
...
Function variables
2014-03-23 21:34:35 -04:00
Josh de Leeuw
99d2692428
adding normalizeTrialVariables() call to every plugin and plugin template. addresses issue #35
2014-03-14 13:10:33 -04:00
Josh de Leeuw
807eaeb066
Merge pull request #37 from jodeleeuw/master
...
update branch with master bug fixes
2014-03-14 11:07:07 -04:00
Josh de Leeuw
7277576b10
css bug
2014-03-03 14:36:47 -05:00
Josh de Leeuw
2e9ce585c2
Fixing css id bugs
2014-03-03 14:26:58 -05:00
Josh de Leeuw
43fac3c674
minor bug
2014-03-03 11:59:01 -05:00
Josh de Leeuw
30df65e95b
First pass at allowing functions as variables
2014-03-03 11:47:16 -05: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
dc5081aae3
Delete jspsych-utils.js
...
all functions have been moved elsewhere.
2014-02-28 17:47:15 -05:00
Josh de Leeuw
75a61e3abd
Merge pull request #33 from jodeleeuw/merge-palmer-stimuli-function
...
Merge palmer stimuli function
2014-02-28 17:46:15 -05:00
Josh de Leeuw
67910476f4
fix bug with div names
2014-02-28 17:44:44 -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
9233f092a6
Get rid of palmer methods
...
Issues #30 and #31
2014-02-24 19:15:14 -05:00
Josh de Leeuw
aaace2dfe6
Adding generate_stimulus method
...
- copied over from utils file.
- some functions not included (left commented out). need to figure out why they were there in the first place...
Related to issue #30
2014-02-24 19:13:16 -05:00
Josh de Leeuw
f5a7c09493
Update README.md
2014-02-21 15:43:21 -05:00
Josh de Leeuw
b06a1fc5f3
Update README.md
2014-02-21 13:25:47 -05:00
Josh de Leeuw
03f70efbe2
moving stimulus creation to a separate public function so that stimuli can be generated for other plugins
2014-02-20 21:20:14 -05:00
