HoshinoKoji/jsPsych
1
0
Fork 0
mirror of https://github.com/jspsych/jsPsych.git synced 2025-05-13 00:58:12 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
840 Commits 14 Branches 506 Tags 58 MiB
91b99e1d56
Commit Graph

324 Commits

Author SHA1 Message Date
Josh de Leeuw
30df65e95b First pass at allowing functions as variables 2014-03-03 11:47:16 -05:00
Josh de Leeuw
67910476f4 fix bug with div names 2014-02-28 17:44:44 -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
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
Josh de Leeuw
eb60da88e1 automatically center grid in container 2014-02-20 19:04:23 -05:00
Josh de Leeuw
c36c46ef25 fixing padding bug 2014-02-20 18:20:22 -05:00
Josh de Leeuw
1db1cb8c52 require 0 for blank elements, so that grid size can be automatically determined 2014-02-19 14:22:36 -05:00
Josh de Leeuw
9e5592b662 initial commit of vsl-grid-scene plugin 2014-02-19 12:12:45 -05:00
Josh de Leeuw
9f39bd80e2 closes #26 2014-02-13 11:03:30 -05:00
Josh de Leeuw
b56e1cc3aa adding parameter list to header doc 2014-02-12 17:46:41 -05:00
Josh de Leeuw
5e136e679a a few bug fixes 2014-02-12 17:27:53 -05:00
Josh de Leeuw
a3a08cf00c initial commit of vsl-animate-occlusion plugin 2014-02-12 17:04:33 -05:00
Josh de Leeuw
ea2c978094 css fix was applied incorrectly to survey-likert, resulting in a bug that failed to show slider labels 2014-02-04 19:38:16 -05:00
Josh de Leeuw
9558914b82 changing keyup to keydown 2014-01-27 15:20:03 -05:00
Josh de Leeuw
e76284acb2 fixing timing_post_trial = 0 issue #15 2014-01-27 15:05:16 -05:00
Josh de Leeuw
76457f11be timing_post_trial fix (#15) 2014-01-27 13:30:42 -05:00
Josh de Leeuw
1fe60bff01 timing_post_trial fix (#15) 2014-01-23 09:44:59 -05:00
Josh de Leeuw
b6db7c08f9 fixing issues with 0 as timing parameter (#15) 2014-01-22 23:28:14 -05:00
Josh de Leeuw
36f5757a66 css cleanup (#13) 2014-01-22 23:15:59 -05:00
Josh de Leeuw
968b4ea549 css cleanup (#13) 2014-01-22 19:04:26 -05:00
Josh de Leeuw
53ad86bf20 css cleanup (#13) 2014-01-22 18:36:12 -05:00
Josh de Leeuw
124840d9fa css cleanup (#13) 2014-01-20 16:17:37 -05:00
Josh de Leeuw
98e9f43af0 css cleanup (#13) 2014-01-20 16:12:15 -05:00
Josh de Leeuw
a1d882d385 cleanup css (#13) 2014-01-20 14:43:28 -05:00
Josh de Leeuw
54c0043e62 update css (#13) 2014-01-17 17:22:41 -05:00
Josh de Leeuw
719b5c9196 cleanup css (#13) 2014-01-17 16:17:18 -05:00
Josh de Leeuw
6c3c49af33 cleanup css names (#13) 2014-01-17 16:15:16 -05:00
Josh de Leeuw
e2e60e8048 Change from keyup to keydown 2014-01-16 10:08:56 -05:00
Josh de Leeuw
478da23caf record current stim in response 2014-01-13 14:42:37 -05:00
Josh de Leeuw
4943c140ec adding response collection capability, ability to add blank interval between frames 2014-01-13 14:35:04 -05:00
Josh de Leeuw
5554018c6b adding response collection capability, ability to add blank interval between frames 2014-01-13 14:29:17 -05:00
Josh de Leeuw
0c2fdbd2e8 testing branch setup on cloud9 2014-01-13 13:37:37 -05:00
Josh de Leeuw
f74752a23f updating header doc 2013-12-10 13:02:52 -05:00
Josh de Leeuw
0da9a164a3 moving visibility reveal after content is updated 2013-12-10 13:00:05 -05:00
Josh de Leeuw
90cc26a44e visible property bug 2013-12-10 12:33:28 -05:00
Josh de Leeuw
fae8ee7880 fixing height of labels container 2013-12-10 11:27:14 -05:00
Josh de Leeuw
6aed75b9d1 revising sim plugin to provide more flexibility in how the trial unfolds - related to #12 2013-12-10 11:21:20 -05:00
Josh de Leeuw
07a667307b rt was not being recorded correctly when continue_after_response was false 2013-12-07 15:02:51 -05:00
Josh de Leeuw
1c3a0bab9a bug fix with continue_after_response 2013-12-05 20:50:15 -05:00
Josh de Leeuw
7553c98bcd bug fix with continue_after_response 2013-12-05 20:45:51 -05:00
Josh de Leeuw
09af7112ec moving categorize animation into the main folder 2013-12-03 12:21:31 -05:00
Josh de Leeuw
31347c15d6 updating categorize-animation plugin to match standards of other plugins 2013-12-03 11:00:23 -05:00
Josh de Leeuw
4bdf7a2dce fixing naming of stimulus elements in data 2013-11-18 22:24:36 -05:00
Josh de Leeuw
635bfadf92 Adding a template for creating a new plugin 2013-11-18 12:17:49 -05:00
Josh de Leeuw
5e75ea964d Adding a keydown requirement so that plugin will not advance if key is already pressed when user arrives at plugin page 2013-11-14 11:40:32 -05:00
Josh de Leeuw
75da56a591 bug fix string' 2013-11-12 12:22:06 -05:00
Josh de Leeuw
7485be16f3 adding built in styles for slider labels in similarity plugin 2013-11-12 12:21:24 -05:00
Josh de Leeuw
5a62ceba55 adding back in prompt and fixing a/b mixup 2013-11-12 11:38:57 -05:00
Josh de Leeuw
23e42af954 first line was missing 2013-11-12 11:29:14 -05:00
Josh de Leeuw
1c5445d285 naming issue with survey-likert 2013-11-11 17:47:08 -05:00
Josh de Leeuw
eb2238dfe6 fixing comments 2013-11-09 21:19:06 -05:00
Josh de Leeuw
35880b0bba fixing naming issue in survey-text 2013-11-09 21:04:14 -05:00
Josh de Leeuw
17deebeee4 fixing naming issue in survey-text 2013-11-09 21:04:03 -05:00
Josh de Leeuw
5fbae5695a fixing data in likert 2013-11-09 20:48:25 -05:00
Josh de Leeuw
af6f48e0c3 fixing defaults in likert 2013-11-09 20:47:43 -05:00
Josh de Leeuw
3a9e4b4354 renaming a_path b_path, etc.. 2013-11-09 15:27:55 -05:00
Josh de Leeuw
2e5a79a872 bug fix single-stim 2013-11-09 15:24:41 -05:00
Josh de Leeuw
ca123a3ff1 renaming a_path b_path, etc.. 2013-11-09 15:20:42 -05:00
Josh de Leeuw
356a11d77e renaming a_path b_path, etc.. 2013-11-09 15:19:15 -05:00
Josh de Leeuw
8330840c45 adding default value to palmer edtiable param 2013-11-08 22:57:40 -05:00
Josh de Leeuw
41f4db123e adding moredata storage to html plugin 2013-11-08 22:35:42 -05:00
Josh de Leeuw
01db67eebd changing defaults in html plugin 2013-11-08 22:32:39 -05:00
Josh de Leeuw
e697961a75 renaming stuff in html plugin 2013-11-08 22:24:28 -05:00
Josh de Leeuw
684710246a bug fix incall-function 2013-11-08 19:16:56 -05:00
Josh de Leeuw
a479e1d908 Changing data names for animation plugin 2013-11-08 17:46:36 -05:00
Josh de Leeuw
fa67e25ada Changing default values in categorize plugin 2013-11-08 16:26:52 -05:00
Josh de Leeuw
6e32293a9d comments and cleanup 2013-10-24 14:30:50 -04:00
Josh de Leeuw
45dac15b1b renaming the same/diff plugin 2013-10-24 10:05:31 -04:00
Josh de Leeuw
17610d0d3a comments and cleanup 2013-10-24 10:04:40 -04:00
Josh de Leeuw
fa17066aed commenting for animation plugin 2013-10-23 13:47:08 -04:00
Josh de Leeuw
36f6d8b4ce changing method to write data in the plugins 2013-10-22 14:52:10 -04:00
Josh de Leeuw
43a76df8e3 cleaning up html plugin 2013-10-21 17:48:08 -04:00
Josh de Leeuw
5c1654db57 cleaning up text plugin code and comments 2013-10-21 17:46:43 -04:00
Josh de Leeuw
a102d46d11 renaming singleimage-keyresponse as single-stim, adding clarifying comments 2013-10-21 17:41:18 -04:00
Josh de Leeuw
661fb0c1b0 commenting more on categorize 2013-10-20 22:56:00 -04:00
Josh de Leeuw
62f65293d0 putting categorize plugin back in 2013-10-20 22:18:43 -04:00
Josh de Leeuw
24617d2a6d adding back likert plugin 2013-10-20 22:16:56 -04:00
Josh de Leeuw
77a2c65d1c making sure plugins are in dev folder 2013-10-20 22:12:51 -04:00
Josh de Leeuw
20ec6f8820 restructuring to clearly separate finalized plugins versus those in development. updating the xab plugin to conform with style, improving commenting. 2013-10-20 22:11:50 -04:00
Josh de Leeuw
cd46e3e3f6 bug fix palmer 2013-10-14 13:26:59 -04:00
Josh de Leeuw
a5406eb17e bug fix palmer 2013-10-14 13:22:17 -04:00
Josh de Leeuw
a622e353f5 bug fix palmer 2013-10-12 20:04:05 -04:00
Josh de Leeuw
17f3a07c62 bug fix palmer 2013-10-12 20:02:45 -04:00
Josh de Leeuw
6a58dd0609 bug fix palmer 2013-10-12 19:59:55 -04:00
Josh de Leeuw
1948f4b4e6 bug fix palmer 2013-10-12 19:52:33 -04:00
Josh de Leeuw
05295290c3 bug fix palmer 2013-10-12 19:50:19 -04:00
Josh de Leeuw
d0bcae3597 bug fix palmer 2013-10-12 19:47:15 -04:00
Josh de Leeuw
41223b0f3d bug fix palmer 2013-10-12 19:24:38 -04:00
Josh de Leeuw
8e8359d357 bug fix palmer 2013-10-12 18:46:02 -04:00
Josh de Leeuw
6ef6bb33a0 bug fix palmer 2013-10-12 18:38:28 -04:00
Josh de Leeuw
7ce2f70201 adding feedback to p 
;
 2013-10-12 18:32:48 -04:00
Josh de Leeuw
38d253b3da adding feedback to palmer 2013-10-12 18:27:21 -04:00
Josh de Leeuw
ff4ffcc287 bug fix palmer 2013-10-12 15:03:44 -04:00
Josh de Leeuw
46f40222b7 adding prompt capability to palmer 2013-10-12 14:57:43 -04:00
Josh de Leeuw
6a8ad3b1f4 adding utility method to add random connceted line to palmer stimuli 2013-10-10 14:51:09 -04:00
Josh de Leeuw
dada626b20 bug fix palmer plugin' 2013-10-10 14:05:10 -04:00
Josh de Leeuw
adabd825fa bug fix palmer plugin' 2013-10-10 14:01:09 -04:00
Josh de Leeuw
6927c290df bug fix categorize-feedback 2013-10-10 12:28:19 -04:00
Josh de Leeuw
947b326706 bug fix categorize-feedback 2013-10-10 12:26:47 -04:00
Josh de Leeuw
80e9753123 bug fix categorize-feedback 2013-10-10 12:12:26 -04:00
Josh de Leeuw
48d8685157 added the ability to display html content instead of an image in the categorize-feedback plugin 2013-10-10 11:36:29 -04:00
Josh de Leeuw
cf3e135646 palmer plugin bug fix 2013-10-09 21:46:55 -04:00
Josh de Leeuw
39311fd6f3 palmer plugin bug fix 2013-10-09 21:41:12 -04:00
Josh de Leeuw
8ad8ae923f palmer plugin bug fix 2013-10-09 21:35:48 -04:00
Josh de Leeuw
9bc94f4415 Added jspysch-palmer plugin 2013-10-08 13:03:57 -04:00
Josh de Leeuw
dffff5f334 adding trial_index as a default data type 2013-09-26 21:36:52 -04:00
Josh de Leeuw
4f8b71c7e9 fixing bugs in staircase-categorize 2013-09-18 14:42:49 -04:00
Josh de Leeuw
bb0a4c913f fixing bugs in staircase-categorize 2013-09-18 14:41:42 -04:00
Josh de Leeuw
080b510bb9 fixing bugs in staircase-categorize 2013-09-18 14:02:41 -04:00
Josh de Leeuw
fc10f0e79b fixing bugs in staircase-categorize 2013-09-18 13:45:10 -04:00
Josh de Leeuw
5de8e9b42d fixing length bug in staircase-categorize 2013-09-18 13:40:50 -04:00
Josh de Leeuw
239d6f8069 adding staircase plugin take 2 2013-09-17 13:53:36 -04:00
Josh de Leeuw
66a4fdce13 adding staircase plugins 2013-09-17 13:49:14 -04:00
Josh de Leeuw
61a4a60c61 fix trial type bug in animation plugin 2013-03-25 14:48:56 -04:00
Josh de Leeuw
5a81648c05 add likert and survey text 2013-03-20 21:12:28 -04:00
Josh de Leeuw
a4bfaf65d0 adding common data to plugins 
plugins should record trial index as a default.

added data capture for rt to text plugin
 2013-03-06 13:42:17 -05:00
Josh de Leeuw
79cb5911bc added likert scale plugin, modified categorization plugin 
- new plugin for doing likert scale type question
- categorization plugin modified to be more consistent with other
plugins.
- option added to categorization plugin to force subject to hit the
correct key during feedback.
 2013-03-06 12:56:27 -05:00
Josh de Leeuw
6b71893068 updating xab plugin to have more options for presentation 2013-02-19 17:22:20 -05:00
Josh de Leeuw
04b981f3a9 bug fix 2013-01-24 15:54:58 -05:00
Josh de Leeuw
c43247eae6 tidying up plugins 
adding "trial_type" as a default data item

rt got added to similarity plugin
 2013-01-24 15:24:03 -05:00
Josh de Leeuw
9651f983a2 1/21/2013 2013-01-21 18:45:03 -05:00
Josh de Leeuw
25509c9f86 replaced all references to $this with display_element 
$this was confusing on multiple levels, and has now been replaced with a
more appropriately named variable reference.
 2013-01-18 14:26:08 -05:00
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
34cffa2b14 moved plugins to /plugins 2013-01-18 12:41:41 -05:00