Commit Graph

3881 Commits

Author SHA1 Message Date
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
jodeleeuw
4f31bb928c Update README 2012-05-15 19:18:56 -03:00
Josh de Leeuw
be43a59267 editing readme 2012-05-15 18:02:36 -04:00
Josh de Leeuw
a056b6e69c missed the animation and touch plugins in previous changes.
similarity had a bug in the naming of the plugin.
2012-05-15 16:10:10 -04:00
Josh de Leeuw
9c94b4d0b6 Reworking the plugin structure to use the Module javascript design pattern.
Plugins now have a consistent internal structure, with better variable scoping.

This version breaks backward compatibility due to a change in the syntax of how experiment objects are declared.
2012-05-15 16:03:26 -04:00
Josh de Leeuw
9c8884f356 removed showImage and showImages from jspsych.js
fixed ie bugs in similarity
2012-05-14 15:41:15 -04:00
Josh de Leeuw
6656564b63 Fixed IE bugs in animation, categorization, and xab versions. 2012-05-14 15:28:20 -04:00
Josh de Leeuw
c3a42dc358 Lots of changes:
1 - Modified animation library to allow for prompt to be displayed while animation is displayed. Prompt is optional.
2 - Added two categorization plugins, one for training and one for testing.
3 - Started fixing IE issues. Two major problems have been identified and started to be corrected.
	First: setTimeout() behaves differently in IE; optional parameters mean different things. Starting to rewrite all setTimeout calls so they work cross-browser.
	Second: Some of the plugins were using .setAttribute to give a class to an image, so that it could later be removed. IE and others have different methods to do this. Fix is to use jQuery for all of this, which has cross-browser methods.
4 - As a result of 3B, I'm going to deprecate the jsPsych.showImage and jsPsych.showImages functions. They seemed out of place anyways.
2012-05-14 15:11:48 -04:00
Josh de Leeuw
5ffc885139 added a touch version of the xab task (click on the target instead of pressing a key) 2012-04-23 20:56:18 -04:00
Josh de Leeuw
78317f4f9f Merge branch 'HEAD' of https://jodeleeuw@bitbucket.org/dhendrickson/jspsych.git 2012-04-19 14:12:47 -04:00
Josh de Leeuw
e556be06c9 Two changes:
-- added time recording to samedifferent task, which records the actual clock time
that stimuli were onscreen. We're using this data to verify that stimuli are
presented for the desired amount of time.
-- fixed a bug in XAB task, where some correct responses were not being recorded.
2012-04-19 14:11:12 -04:00
Drew Hendrickson
dea7cac8e2 spelling corrections. 2012-04-18 15:00:13 -04:00
Drew Hendrickson
93e8b899da added README file. 2012-04-18 14:46:10 -04:00
Josh de Leeuw
cf073155b6 minor changes 2012-04-05 17:14:27 -04:00
Josh de Leeuw
e88a1b052f Suite of bugfixes and changes related to same-different and animation plugin. Animation plugin is a complete redesign that removes dependency on the canimate.js library. 2012-04-05 14:00:20 -04:00
Josh de Leeuw
6969fbcdc9 Added jspsych-animation, a plugin for trials that involve animation. Given
a set of images, the plugin will show an animation of those images at a
user specified rate.
2012-03-30 12:11:10 -04:00
Josh de Leeuw
dfb0642ec2 verifying git setup 2012-03-30 10:15:53 -04:00
Drew Hendrickson
ee8de223d5 code directly from Josh 2012-03-26 23:32:21 -04:00