Josh de Leeuw
1c2b198d50
removing block from plugin.trial call
2014-09-19 15:25:24 -04:00
Josh de Leeuw
234eb88ebb
replace block.writeData with jsPsych.data.write
2014-09-19 15:22:05 -04:00
Josh de Leeuw
d9c356f6d7
replace block.next with jsPsych.finishTrial();
2014-09-19 15:19:01 -04:00
Josh de Leeuw
e7e3271731
more work to support while chunks
...
Issue #8
2014-09-19 15:05:11 -04:00
Josh de Leeuw
fcf8239578
implements while chunk
...
related to Issue #8
2014-09-19 14:43:59 -04:00
Josh de Leeuw
03386a661f
various bug fixes to get chunks working
2014-09-19 14:21:49 -04:00
Josh de Leeuw
4128984f36
more work on chunk code
2014-09-19 08:45:59 -04:00
Josh de Leeuw
ab30087973
starting to fill in chunk behavior
2014-09-18 16:55:45 -04:00
Josh de Leeuw
73b6524c0f
changing what blocks do
...
now they are just collections of trials, rather than having significant
functionality for running the experiment. the running code is now part
of the jsPsych object.
2014-09-18 09:58:21 -04:00
Josh de Leeuw
ba0ac9c6bf
more changes to support chunks
2014-09-17 17:09:37 -04:00
Josh de Leeuw
4a783ea684
more sketching for chunks
2014-09-17 12:00:36 -04:00
Josh de Leeuw
6fc666ec1e
start sketching out chunks
2014-09-17 11:41:54 -04:00
Josh de Leeuw
c19295bd98
add datastore object
2014-09-17 11:34:00 -04:00
Josh de Leeuw
80158e52f2
wake up this branch
2014-09-17 11:24:29 -04:00
Josh de Leeuw
bc00b48ee2
remove genericParameters from plugin specific implementations
2014-09-16 08:54:09 -04:00
Josh de Leeuw
1d5adf787a
streamline generic trial options
2014-09-16 08:40:10 -04:00
Josh de Leeuw
2ed85be15b
add generic trial options support in core
...
related to issue #36 , #68
2014-09-15 10:53:24 -04:00
Josh de Leeuw
6e24d52acf
fix layout bug
...
issue #67
2014-09-15 09:34:33 -04:00
Josh de Leeuw
9ab6543cb0
starting to handle trial level callbacks
...
however, this will probably not be able to happen until the code for
creating trials is refactored somewhat. it’s difficult to specify trial
parameters without editing each plugin manually. when plugins can have
standardized values, then the other half of this can go in.
2014-09-12 16:41:01 -04:00
Josh de Leeuw
89f4f1535c
remove part parameter in do trial method
...
closes #64
2014-09-12 16:25:56 -04:00
Josh de Leeuw
109e549b4f
remove part parameter from plugins
...
related to issue #64
2014-09-12 16:24:53 -04:00
Josh de Leeuw
2574f41acb
remove now-redundant data from plugins
...
closes issue #65
2014-09-12 16:10:41 -04:00
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
7c1da93010
enforce array for continue key
2014-09-10 09:33:04 -04:00
Josh de Leeuw
2d9af8dfa9
clean formatting, remove redundant data
2014-09-09 08:36:39 -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
03ce248d0b
Fixed bugs when timing_response was > 0
...
Related to Issue #62 .
Also, explicitly canceled keyboard listener in cases where trial ended and participant didn't respond.
2014-09-02 10:17:07 -04:00
Josh de Leeuw
3e96600423
remove unnecessary startTime record
2014-07-27 11:05:16 -04:00
Josh de Leeuw
81248f7d61
Merge pull request #61 from jodeleeuw/master
...
merge master to dev
2014-07-27 10:49:30 -04:00
Josh de Leeuw
655d5cef91
bug fix other "
2014-07-22 07:15:12 -04:00
Josh de Leeuw
05df09502e
bug missing "
2014-07-22 06:40:47 -04:00
Josh de Leeuw
ada763ce3b
Merge pull request #60 from jodeleeuw/dev
...
update to v3.1
2014-07-16 13:47:48 -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
a340f9c7ef
Merge pull request #59 from jodeleeuw/css
...
Css
2014-07-09 12:01:47 -04:00
Josh de Leeuw
351542dc6c
bug fixes with size and location of raphael canvas
...
also, show fixation throughout entire trial
2014-07-06 22:46:14 -04:00
Josh de Leeuw
a0113f70ea
add jsPsych email group
2014-07-06 14:06:27 -04:00
Josh de Leeuw
9fe361306d
add a few plugins
2014-07-04 20:57:12 -04:00
Josh de Leeuw
5acb0aba9b
add class info for left/right
2014-07-04 20:53:41 -04:00
Josh de Leeuw
c5fda9fad0
Create jspsych.css
2014-07-04 17:06:12 -04:00
Josh de Leeuw
c7e4050e94
change css info
2014-07-04 16:57:28 -04:00
Josh de Leeuw
bd5a97fee2
change class of image
2014-07-04 16:53:16 -04:00
Josh de Leeuw
b7a658e825
Merge pull request #58 from jodeleeuw/visual-search-circle
...
Visual search circle
2014-07-04 16:20:59 -04:00
Josh de Leeuw
35deb1935b
update header
2014-07-04 16:19:45 -04:00
