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
1a99f966be major changes for likert scale (#169) 2015-12-08 12:44:29 -05:00
Josh de Leeuw
94f772e41e allow override of default timing_post_trial (#176) 2015-12-07 16:48:37 -05:00
Josh de Leeuw
199eac2f42 use regex for replace (#202) 2015-12-07 15:49:54 -05:00
Josh de Leeuw
3f03f8d97f add btn class (#172) 2015-12-07 15:48:49 -05:00
Josh de Leeuw
f1c7d39630 implements #191 2015-10-19 11:56:43 -04:00
Josh de Leeuw
4e0f0fe920 fixes #188 2015-10-19 08:53:08 -04:00
Wolfgang Walther
42424ede2e Update jspsych-survey-text.js 
Correct wrong css class and id (likert -> text)
 2015-09-26 03:06:21 +02:00
Shane Martin
370c60ef0e Merge branch 'feature-1' into develop 2015-09-23 10:18:43 -04:00
Shane Martin
e8cc6a5686 Add HTML5-based validation parameter 2015-09-23 10:18:30 -04:00
Shane Martin
6e35baceda Merge branch 'feature-1' into develop 2015-09-11 12:05:43 -04:00
Shane Martin
05aa64847e Fix submit button text 2015-09-11 12:05:25 -04:00
Shane Martin
201c9f8846 Revert "Revert "Allow overlap between response groups"" 
This reverts commit 649a1c2266.
 2015-09-11 11:34:42 -04:00
Shane Martin
649a1c2266 Revert "Allow overlap between response groups" 
This reverts commit 3e1a05ab19.
 2015-09-10 14:21:35 -04:00
Shane Martin
adbc4053b8 Change option values to label name 2015-09-10 14:15:16 -04:00
Shane Martin
23b7b4a39b Add horizontal option and add plugin styling 2015-09-10 14:02:32 -04:00
Shane Martin
116f958ebe Add response object value retrieval 2015-09-10 13:38:46 -04:00
Shane Martin
a9b6a81635 Convert plugin to display radio buttons 2015-09-10 13:21:16 -04:00
Shane Martin
80b8000384 Duplicate likert plugin, with name replacements 2015-09-10 11:43:43 -04:00
Shane Martin
3e1a05ab19 Allow overlap between response groups 2015-08-28 10:20:58 -04:00
Tim Vergenz
aabf545cd7 same-different: Add answer field to collected data 2015-08-08 08:29:36 -04:00
Tim Vergenz
6171a8bfcd same-different: Allow self-pacing for first stimulus 2015-08-08 08:29:36 -04:00
Josh de Leeuw
3fa2e3def0 button-response plugin #161 2015-07-17 10:17:11 -04:00
Josh de Leeuw
1b142809d2 draft of button response plugin 2015-07-17 08:52:00 -04:00
Josh de Leeuw
9074c42e63 implements #148 2015-06-26 15:52:15 -04:00
Josh de Leeuw
a14685f48c fix ghost svg canvas bug 2015-06-19 09:18:03 -04:00
Josh de Leeuw
abce61cb0d fix bug with identifier #145 2015-06-15 14:27:53 -04:00
Josh de Leeuw
66cc32d56f changes API calls to getKeyboardResponse in plugins 2015-06-12 13:53:13 -04:00
Josh de Leeuw
b132e2a137 Merge pull request #151 from jodeleeuw/master 
merge master updates into dev
 2015-06-12 12:49:57 -04:00
Josh de Leeuw
952d9c7023 fix bug with persisting event handler 2015-06-08 09:49:16 -04:00
Josh de Leeuw
cfe8c17c19 implements #145 
includes docs update
 2015-06-04 15:55:49 -04:00
Josh de Leeuw
71f451f4bb restores text parameter in enforceArray 2015-05-29 08:16:41 -04:00
Josh de Leeuw
eff15d8fa6 fixes #116 2015-05-28 12:45:43 -04:00
Josh de Leeuw
7f2b8d8d5c fixes #123 2015-05-28 10:04:03 -04:00
Josh de Leeuw
37fa9d9113 implements #142 2015-05-28 09:58:47 -04:00
Josh de Leeuw
23653e7eef implements #143 2015-05-28 09:45:21 -04:00
Josh de Leeuw
723052b578 add instructions plugin 2015-05-27 12:10:33 -04:00
Josh de Leeuw
d95b884c5a fixes #129 2015-05-27 09:06:41 -04:00
Josh de Leeuw
99e9ceb8a8 fixes #140 2015-05-22 09:48:00 -04:00
Josh de Leeuw
a5ed62a550 remove logging 2015-02-19 11:45:36 -05:00
Josh de Leeuw
8271a03a82 bug fix when preamble is not defined 2015-02-18 20:04:58 -05:00
Josh de Leeuw
1218c58350 fix bug 2015-02-18 17:10:26 -05:00
Josh de Leeuw
6a46d65df0 fix raphael -> snapsvg 2015-02-18 16:18:41 -05:00
Josh de Leeuw
5453518f0d force parameter size 2015-02-18 14:33:23 -05:00
Josh de Leeuw
5cb5f0bfe7 bug fix with keyboard listener 2015-02-18 14:27:38 -05:00
Josh de Leeuw
849c468275 bug fixes 2015-02-18 12:27:26 -05:00
Josh de Leeuw
79b06f665a minor issue with timing = 0 2015-02-18 11:44:53 -05:00
Josh de Leeuw
1c82ef4c32 Merge pull request #115 from mariansauter/patch-4 
allow timing_max_search = 0
 2015-02-18 11:31:48 -05:00
Josh de Leeuw
d4d31e27a2 replace Raphael with Snap 
issue #78
 2015-02-18 11:12:05 -05:00
mariansauter
d30dac1dbe allow timing_max_search = 0 
I added the possibility that the timing_max_search equals 0 so that the search display is not shown at all (circumventing setTimeout)

This might be very specifically handy for my purpose, because I can use the same plugin to show my probe at the fixation stimulus place before the actual search display. In any case, this change does not hurt and just allows timing_max_search = 0 to work
 2015-02-11 23:28:29 +01:00
Josh de Leeuw
f952f5ccf7 html plugin check_fn returns true by default 
issue #106
 2015-02-05 17:03:31 -05:00
Josh de Leeuw
d3346753a9 fix bug on feedback trials with categorize plugins 
issue #103
 2015-02-05 16:49:21 -05:00
Josh de Leeuw
3eba68c20e fix function as stimuli parameter issue 
issue #109
 2015-01-29 19:57:07 -05:00
Josh de Leeuw
f83aa5a20c bug fix for undefined preamble param 2014-12-17 12:37:55 -05:00
Josh de Leeuw
3516456a52 update to snap.svg dependency 
also fixes bizarre chrome issue that is probably a chrome bug.

issue #78
 2014-12-16 16:02:20 -05:00
Josh de Leeuw
d62ed7d851 fix unfinished code 2014-11-25 10:47:14 -05:00
Josh de Leeuw
05863b3e5d add reconstruction plugin 2014-11-24 09:05:15 -05:00
Josh de Leeuw
14fbe9d67f allow keys as strings 
issue #97
 2014-11-14 15:19:45 -05:00
Josh de Leeuw
d01e6edb61 allow choices parameter to be 'none' 
issue #90
 2014-11-14 15:09:39 -05:00
Josh de Leeuw
74ad0f9c1d update documentation info in header 
closes #84
 2014-11-14 15:05:54 -05:00
Josh de Leeuw
3e543c4d11 add preamble 
issue #94
 2014-11-14 15:03:23 -05:00
Josh de Leeuw
83a58ee36f fix variable conflict 
issue #96
 2014-11-13 08:37:38 -05:00
Josh de Leeuw
ad6f9bf3ca add preamble for survey-likert 
related to issue #94
 2014-11-11 12:22:12 -05:00
Josh de Leeuw
840cfa908c working audio plugin 
- needed to change keyboardResponse method to support measuring RT off
of the audio context
- related to issues #3 and #4
 2014-11-11 09:15:26 -05:00
Josh de Leeuw
bbd9461a1f use audio support functions to run plugin 2014-11-11 08:38:11 -05:00
Josh de Leeuw
a139b13927 starting to put together an audio plugin 2014-11-10 17:13:51 -05:00
Josh de Leeuw
ae9877b8d1 Merge pull request #89 from jodeleeuw/dev 
Dev
 2014-11-10 09:14:53 -05:00
Josh de Leeuw
8d0d3c2c49 better default value for timing_tim 2014-11-10 09:12:50 -05:00
Josh de Leeuw
bad562fbf2 using display_element in visual search 
related to issue #81
 2014-10-31 11:18:29 -04:00
Josh de Leeuw
d51d6741bf bug fix: issue #86 
fixes #86
 2014-10-30 17:04:19 -04:00
Josh de Leeuw
f4782521e0 change data format for survey questions 
Closes #80
 2014-10-29 09:03:41 -04:00
Josh de Leeuw
5a40ae070a record stimulus as a single entry in data 
Closes #79
 2014-10-28 18:18:04 -04:00
Josh de Leeuw
ed6546e0b7 fix default value for choices 
Closes #83
 2014-10-28 18:12:34 -04:00
Josh de Leeuw
ff9a7b6343 bug fixes 2014-10-28 18:02:58 -04:00
Josh de Leeuw
0af5bd3f2b add multi-stim-multi-response plugin 2014-10-28 11:49:09 -04:00
Erik Weitnauer
8a0bdc977d fixed timing bug in htlm-plugin 
It was just a typo.
 2014-10-21 13:36:51 -04:00
Josh de Leeuw
026d715304 rename stimuli to stimulus in vsl grid data fix 2014-10-21 12:30:49 -04:00
Josh de Leeuw
3ba276da5b rename stimuli to stimulus in vsl grid data 2014-10-21 12:29:50 -04:00
Josh de Leeuw
51716711d1 doc updates, rename reps -> sequence_reps 2014-10-16 09:32:21 -04:00
Josh de Leeuw
5be6dc2c11 remove args param 2014-10-16 08:35:36 -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
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
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
03386a661f various bug fixes to get chunks working 2014-09-19 14:21:49 -04:00
Josh de Leeuw
bc00b48ee2 remove genericParameters from plugin specific implementations 2014-09-16 08:54:09 -04:00
Josh de Leeuw
6e24d52acf fix layout bug 
issue #67
 2014-09-15 09:34:33 -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
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
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
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
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
5acb0aba9b add class info for left/right 2014-07-04 20:53:41 -04:00