Commit Graph

406 Commits

Author SHA1 Message Date
Josh de Leeuw
92219b75d0 more docs updates 2014-10-17 10:48:39 -04:00
Josh de Leeuw
f5aa15348d Update randomization-repetition.md 2014-10-16 20:46:28 -04:00
Josh de Leeuw
08f77beca3 Update randomization-repetition.md 2014-10-16 20:45:59 -04:00
Josh de Leeuw
9ec7bf230c Update mturk.md 2014-10-16 20:43:05 -04:00
Josh de Leeuw
6e637de614 Update overview.md 2014-10-16 19:26:06 -04:00
Josh de Leeuw
0d131c26d1 Update jspsych-pluginAPI.md 2014-10-16 19:19:31 -04:00
Josh de Leeuw
ec5caa3c78 adding pluginAPI docs 2014-10-16 16:43:36 -04:00
Josh de Leeuw
bfed3e8cfa adding data module docs 2014-10-16 14:37:06 -04:00
Josh de Leeuw
be2ead4cd6 clean up pages without content 2014-10-16 13:01:53 -04:00
Josh de Leeuw
48ac399886 adding randomization and turk module docs 2014-10-16 12:42:15 -04:00
Josh de Leeuw
3c6d7fdd66 removing force_refresh option for turkInfo
just parse the string every time
2014-10-16 11:06:43 -04:00
Josh de Leeuw
a8eb2b99a5 update read me 2014-10-16 10:29:51 -04:00
Josh de Leeuw
070dbf68c4 add support doc 2014-10-16 10:28:31 -04:00
Josh de Leeuw
7259badd35 add docs for categorize plugin 2014-10-16 10:11:02 -04:00
Josh de Leeuw
51716711d1 doc updates, rename reps -> sequence_reps 2014-10-16 09:32:21 -04:00
Josh de Leeuw
7beb851b7d add call-function doc 2014-10-16 08:41:59 -04:00
Josh de Leeuw
5be6dc2c11 remove args param 2014-10-16 08:35:36 -04:00
Josh de Leeuw
a3cd98921c adding documentation files 2014-10-15 17:44:41 -04:00
Josh de Leeuw
b5fc742461 change repetitions -> sequence_reps
prevents conflict with new default repetitions option
2014-10-15 17:31:30 -04:00
Josh de Leeuw
9d816dbf2b change blocks to timeline
closes #77
2014-10-15 13:43:28 -04:00
Josh de Leeuw
5546f08094 add getLastChunkData; edge case handling 2014-10-01 08:34:28 -04:00
Josh de Leeuw
f2c0ebf63d add getLastTrialData function 2014-10-01 08:28:50 -04:00
Josh de Leeuw
4171f8d461 adding if chunk 2014-10-01 02:51:47 +00:00
Josh de Leeuw
8cef6f089e semicolon 2014-10-01 02:22:51 +00:00
Josh de Leeuw
720b150e50 adding code to remove setTimeouts when trial ends
issue #62
2014-09-30 08:53:08 -04:00
Josh de Leeuw
e262c52ee9 fix timeout issue
issue #62
2014-09-29 15:47:05 -04:00
Josh de Leeuw
9b617435e8 remove editable option
Closes #72
2014-09-29 14:02:04 -04:00
Josh de Leeuw
940c5580f8 fix xab bug and formatting
Closes #74
2014-09-29 08:17:19 -04:00
Josh de Leeuw
6f10c190c5 implement randomize_order and repetitions opts
closes issue #70
2014-09-25 09:13:08 -04:00
Josh de Leeuw
c5c0298c9a remove line 2014-09-24 08:53:49 -04:00
Josh de Leeuw
e07e05ce35 implement ability to get index of trial relative to block 2014-09-24 08:51:44 -04:00
Josh de Leeuw
c1c60c209d update progress bar spec
shows progress based on which chunk the subject is currently doing in
the root_chunk object. this means that progress updates less often, but
the experimenter can always break out blocks into lots of chunks if
they want the progress to update more frequently.
2014-09-24 08:37:28 -04:00
Josh de Leeuw
ac5c707516 Merge pull request #69 from jodeleeuw/dev-chunks
Dev chunks
2014-09-23 16:47:27 -04:00
Josh de Leeuw
e4d2766f8b cleaning up stuff that isn't needed. 2014-09-23 16:31:01 -04:00
Josh de Leeuw
044cbc3d6e more fixes for nested chunks
- fixed method to get data associated with chunk ID
- isComplete now works for root type chunk
2014-09-23 16:14:36 -04:00
Josh de Leeuw
619d9ffa05 reconfiguring chunk to be tree-like
now there is a root chunk which contains the entire experiment, with
all other chunks being branches off of the root. lots of tweaking to
chunk ID code to get dynamic IDs depending on how many iterations of a
chunk have happened.
2014-09-23 14:10:51 -04:00
Josh de Leeuw
044cf9c780 trying to implement nested chunks
this is really broken right now.
2014-09-22 09:40:34 -04:00
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