Commit Graph

67 Commits

Author SHA1 Message Date
Josh de Leeuw
42d78b3510 added options to si-kr plugin
can now opt to leave the stimulus on the screen for a fixed length of
time, still recording the responses when they occur.

also allows a timelimit to be set on the responses, so that if no
responses is recorded after some period of time, the trial completes and
records a -1 as the response.
2013-01-18 14:24:09 -05:00
Josh de Leeuw
a08dbc7029 created jspsych-utils.js
added function to generate flat data array from hierarchical
jspsych.data object.
2013-01-18 13:00:33 -05:00
Josh de Leeuw
34cffa2b14 moved plugins to /plugins 2013-01-18 12:41:41 -05: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
d073e8834b added twoimage-keyresponse 2012-11-01 14:40:05 -04:00
Josh de Leeuw
be236ba383 renamed categorize-unknown to singleimage-keyresponse
Also did some significant simplification in the code. This change is
meant to reflect the fact that the plugin can be used for a lot more
than categorization tasks.
2012-11-01 14:11:33 -04:00
Josh de Leeuw
4d24a107a8 added ballistic-match-2, experimental plugin
don't use it probably...
2012-10-18 20:35:28 -04:00
Josh de Leeuw
dcaeb9b65e bug fix to ballistic-match 2012-10-01 18:13:07 -04:00
Josh de Leeuw
beb94dd459 changed timing options for xab, sim
now second stimuli can be displayed for fixed time instead of
indefinitely.
2012-09-28 14:38:17 -04:00
Josh de Leeuw
eddc53f91a update to 1.04
--added mouse option to text, click to advance.
--touch-freepick added, not a generalized plugin yet
--ballistic-match, not a generalized plugin yet.
2012-09-25 18:43:19 -04:00
Josh de Leeuw
ef9007fbcd changed score data to sim_score data 2012-09-13 17:28:23 -04:00
Josh de Leeuw
236f7ce4c5 custom labels option for similarity plugin 2012-09-13 17:26:16 -04:00
Josh de Leeuw
3d17d5c2ee changed similarity label to "identical" 2012-09-13 17:24:30 -04:00
Josh de Leeuw
3aeae053a0 changed data storage for free-sort to use JSON encoding 2012-09-13 17:23:25 -04:00
Josh de Leeuw
4c7463273b started work on freepick touch plugin
do not use. still in development.
2012-09-11 13:11:05 -04:00
Josh de Leeuw
ca38b559f1 Added extensive commenting to text plugin 2012-09-11 13:10:40 -04:00
Josh de Leeuw
817c9f4118 bug fix active-match
wasn't resetting the response variables, so responses were being
appended onto the list instead of creating a new list.
2012-09-06 17:18:29 -04:00
Josh de Leeuw
fc6321de8a minor commenting 2012-09-06 16:35:05 -04:00
Josh de Leeuw
691e8086ff call-func fix; added active-match
call-function: changed data storage so that if there was no return value
then no data would be stored in the data object. this helps when trying
to write data to a database as the empty data can be safely ignored.

active-match: new plugin for manipulating an image until it matches
another image.
2012-08-22 12:09:06 -04:00
Josh de Leeuw
9086cf59ce Update README.md 2012-07-26 17:52:35 -03:00
Josh de Leeuw
4ea424b465 added variables option to jspsych-text
variables (in the form of functions) can be passed in to the text plug
in and their contents (return values) are substituted into the string
when the text plugin is displayed.

(also fixed bug in xab where correct/incorrect were backwards -- as of
jul 17 commit)
2012-07-26 16:02:11 -04:00
Josh de Leeuw
15cc690a9f added force_refresh option to -html plugin
html plugin was not pulling the most recent version of the html document
if the document was already in the browser cache. if force_refresh is
set to true, then the current timestamp is appended on as a URL argument
as a means to force the browser to grab the newest version.
2012-07-25 15:13:11 -04:00
Josh de Leeuw
f7bc23c741 fixed bug in call-function
args were not being passed in as an array
2012-07-24 13:23:51 -04:00
Josh de Leeuw
711959ce83 ensure that user defined prompt is removed in XAB 2012-07-24 12:43:10 -04:00
Josh de Leeuw
a0f0eb367e added default repetitions=1 to jspsych-animation 2012-07-23 17:38:00 -04:00
Josh de Leeuw
d2d06d0772 added prompt option to XAB 2012-07-23 17:14:50 -04:00
Josh de Leeuw
8b7e9f0aa9 bug fix in call-function 2012-07-20 13:30:18 -04:00
Josh de Leeuw
caaab0b84f added options to categorize-animation
can now set the number of repetitions of the animation, and choose to
allow user input before the animation is complete.
2012-07-20 12:02:42 -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
Josh de Leeuw
19983090a8 Added optional callback methods for tiral start and trial finish events in core library.
Can now pass in functions to the core library on init() so that a
function can be called at the start or end of every trial.
2012-07-17 18:05:09 -04:00
Josh de Leeuw
b33ab88b22 Added core.progress
// core.progress returns an object with the following properties
//   total_blocks: the number of total blocks in the experiment
//  total_trials: the number of total trials in the experiment
//  current_trial_global: the current trial number in global terms
//      i.e. if each block has 20 trials and the experiment is
//     currently in block 2 trial 10, this has a value of 30.
//  current_trial_local: the current trial number within the block.
//  current_block: the current block number.

Useful for showing user progress through the experiment. Planning to add
an option to show a progress bar in the future.
2012-07-17 17:51:17 -04:00
Josh de Leeuw
b8a72862cf added keys option to XAB
Added two optional parameters to the XAB plugin so that they key that
subjects press to answer left/right is a parameter. The parameters have
default values of 'q' and 'p' to maintain compatibility.
2012-07-17 16:24:25 -04:00
Josh de Leeuw
39846f1754 recommit of previous commit since nothing was changed...
jspsych-similarity.js : fixed data storage so that generic data object
was included in the block's data.

jspsych-storybook.js: included generic data object in data storage,
included path to image in data storage.

jspsych.js: cosmetic adjustment to code in finishExperiment() method.

NEW:

added call-function plugin, which calls a user-specified function.
useful for saving data before completion.

added paint plugin - displays a canvas element superimposed on an image
and allows subjects to draw on the image to indicate areas of interest.
2012-07-12 13:22:06 -04:00
Josh de Leeuw
ef9a605cd8 misc changes / additions (see extended description)
jspsych-similarity.js : fixed data storage so that generic data object
was included in the block's data.

jspsych-storybook.js: included generic data object in data storage,
included path to image in data storage.

jspsych.js: cosmetic adjustment to code in finishExperiment() method.

NEW:

added call-function plugin, which calls a user-specified function.
useful for saving data before completion.

added paint plugin - displays a canvas element superimposed on an image
and allows subjects to draw on the image to indicate areas of interest.
2012-07-12 13:18:55 -04:00
Erik Weitnauer
fbe4b3ea3e html plugin accepts an check function now, that is called before proceeding. 2012-07-11 11:07:33 -04:00
Erik Weitnauer
41519c5079 added plugin that can load and display an html page 2012-07-10 15:52:11 -04:00
Josh de Leeuw
dc6a9761f3 plugin changes
similarity, categorize-animation, and storybook got revised. minor
revisions.
2012-07-05 12:31:13 -04:00
Josh de Leeuw
3c04677878 added core.data()
jsPsych.data() now returns an array that contains all of the data from
the experiment.
2012-07-05 12:30:36 -04:00
Josh de Leeuw
17b9f5bd6d remove json
No need for jQuery json library in repository.
2012-06-29 13:21:00 -04:00
Josh de Leeuw
338a21d199 breaking change
changes to the core jspsych.js file will break some backwards
compatibility. script files are no longer loaded dynamically, due to
issues with using $.getScript on local installations. this revision
makes defining a list of plugins unnecessary; they are automatically
recognized based on the experiment structure.

changes to similarity plugin: display is now sequential.

adding storybook plugin: this is an ipad plugin, which displays a single
image and records the location of touch events.
2012-06-29 13:16:24 -04:00
Josh de Leeuw
de1087dc26 Update README.md 2012-06-01 12:48:47 -03:00
Josh de Leeuw
ed5034bbd0 Minor bug corrections 2012-05-24 16:51:03 -04:00
Josh de Leeuw
8bd466c18f Merge branch 'HEAD' of git@github.com:jodeleeuw/jsPsych.git 2012-05-23 12:19:40 -04:00
Josh de Leeuw
94610dbccc Fixing some bugs due to change in the plugin structure. 2012-05-23 12:18:57 -04:00
jodeleeuw
90c3780a17 Update README.md 2012-05-17 15:20:46 -03:00
Josh de Leeuw
befdcfc1cd Rescoped everything so that jsPsych is not a jQuery plugin.
The top level object is jsPsych, and plugins are defined as jsPsych.PLUGIN.

The library also loads everything dynamically now, so the user only needs to load the main jsPsych script (and specify the src for any plugins).

This also changes how the library is loaded initially, since it is not based on the jQuery method anymore. See wiki.
2012-05-17 09:19:04 -04:00
Josh de Leeuw
1d1a9c7e34 Merge branch 'HEAD' of git@github.com:jodeleeuw/jsPsych.git 2012-05-15 18:20:42 -04:00
Josh de Leeuw
f108daddb9 md fix? 2012-05-15 18:19:41 -04:00