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

220 Commits

Author SHA1 Message Date
Josh de Leeuw
8b7a5858d1 generalizes to any set size 2014-07-04 11:47:47 -04:00
Josh de Leeuw
8ae2e2b3bb starting to generalize beyond fixed set sizes 2014-07-04 11:35:31 -04:00
Josh de Leeuw
fcb6c51d95 use getKeyboardResponse 2014-07-03 10:05:59 -04:00
Josh de Leeuw
0a965ebfe5 Create jspsych-visual-search-circle.js 2014-07-03 09:56:10 -04:00
Josh de Leeuw
5a2140264d remove extra } 2014-06-30 09:42:11 -04:00
Josh de Leeuw
3c70abc3aa use enforceArray and update namespace of pluginAPI 2014-06-29 21:56:40 -04:00
Josh de Leeuw
3038c25299 use enforceArray and update namespace of pluginAPI 2014-06-29 21:54:54 -04:00
Josh de Leeuw
34af08a74c update namespace of pluginAPI 2014-06-29 21:53:40 -04:00
Josh de Leeuw
88dca27536 use enforceArray and update namespace of pluginAPI 2014-06-29 21:52:25 -04:00
Josh de Leeuw
d9c2e9d1f0 use enforceArray and update namespace of pluginAPI 2014-06-29 21:51:27 -04:00
Josh de Leeuw
f254dc70ad use enforceArray and update namespace of pluginAPI 2014-06-29 21:50:11 -04:00
Josh de Leeuw
903980f413 use enforceArray and update namespace of pluginAPI 2014-06-29 21:42:17 -04:00
Josh de Leeuw
1eb7682aa6 update doc header 2014-06-29 21:39:58 -04:00
Josh de Leeuw
b3f240cbff use enforceArray and update namespace of pluginAPI 2014-06-29 21:39:35 -04:00
Josh de Leeuw
ca52f5fd73 use enforceArray and update namespace of pluginAPI 2014-06-29 21:37:48 -04:00
Josh de Leeuw
1a4910bde5 use enforceArray and update namespace of pluginAPI 2014-06-29 21:36:08 -04:00
Josh de Leeuw
fe210550f1 use enforceArray and update namespace of pluginAPI 2014-06-29 19:25:25 -04:00
Josh de Leeuw
8592f37a7e update doc header 2014-06-29 15:47:55 -04:00
Josh de Leeuw
2b6d651dcb use enforceArray and update namespace of pluginAPI 2014-06-29 15:46:56 -04:00
Josh de Leeuw
71d89a713f use enforceArray and update namespace of pluginAPI 2014-06-29 15:44:46 -04:00
Josh de Leeuw
be1f8de9ba use pluginAPI namespace 2014-06-29 12:13:31 -04:00
Josh de Leeuw
61a0600184 use enforceArray and update namespace of pluginAPI 2014-06-29 10:48:47 -04:00
Josh de Leeuw
ac0ce67f16 use getKeyboardResponse 2014-06-28 21:50:03 -04:00
Josh de Leeuw
62e4d3e9c2 use getKeyboardResponse 2014-06-28 21:46:38 -04:00
Josh de Leeuw
44c3168315 use getKeyboardResponse 2014-06-28 21:43:08 -04:00
Josh de Leeuw
96168396c5 use getKeyboardResponse 2014-06-28 12:12:22 -04:00
Josh de Leeuw
ba7d09c26d use getKeyboardResponse 2014-06-28 10:58:08 -04:00
Josh de Leeuw
fecc9056fe use getKeyboardResponse 2014-06-27 22:54:25 -04:00
Josh de Leeuw
46bd26ed84 use getKeyboardResponse 2014-06-24 18:42:00 -04:00
Josh de Leeuw
9469335344 a few small bugs 2014-06-24 18:35:30 -04:00
Josh de Leeuw
f5bdd16095 update to work with new centralized keyboard response method 2014-06-24 14:28:56 -04:00
Josh de Leeuw
eaf6219fa5 update data saving to block.writeData 2014-06-19 15:36:24 -04:00
Josh de Leeuw
1f0df1f80e allow for text and data to be non-arrays for single trial block 
issue #24
 2014-05-19 10:44:02 -04:00
Josh de Leeuw
efed8009a1 delete files - from master merge 2014-05-19 10:06:21 -04:00
Josh de Leeuw
c5539da1a6 Merge branch 'master' into smart-arrays 
Conflicts:
	jspsych.js
 2014-05-19 10:05:58 -04:00
Josh de Leeuw
d3d6acc4d8 remove variables option 
issue #44
 2014-05-18 11:55:19 -04:00
Josh de Leeuw
3f25eac294 removing dev folder from master branch. see branch plugin-dev-old for recovery. 2014-05-15 14:48:40 -04:00
Josh de Leeuw
55ebe2f413 protect check_fn in normalizeTrialVariables 2014-05-14 15:14:08 -04:00
Josh de Leeuw
b84df35eb0 Remove normalize trial variables method 
This is a bad idea for this plugin, since check_fn is a function. Need to figure out a way to protect variables like this one. For now, just revert to no functions as trial variables for this plugin.
 2014-05-14 12:50:23 -04:00
Josh de Leeuw
8267154774 change default option for choices parameter 2014-05-01 13:58:32 -04:00
Josh de Leeuw
e8b11ed94c Add response collection option 
Record RT since the appearance of the sequence item.
 2014-05-01 13:51:59 -04:00
Josh de Leeuw
99d2692428 adding normalizeTrialVariables() call to every plugin and plugin template. addresses issue #35 2014-03-14 13:10:33 -04:00
Josh de Leeuw
807eaeb066 Merge pull request #37 from jodeleeuw/master 
update branch with master bug fixes
 2014-03-14 11:07:07 -04:00
Josh de Leeuw
7277576b10 css bug 2014-03-03 14:36:47 -05:00
Josh de Leeuw
2e9ce585c2 Fixing css id bugs 2014-03-03 14:26:58 -05:00
Josh de Leeuw
43fac3c674 minor bug 2014-03-03 11:59:01 -05:00
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