Commit Graph

579 Commits

Author SHA1 Message Date
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
22748866b3 update example php
issue #110
2015-02-18 11:22:43 -05:00
Josh de Leeuw
37c7966d9c change id for palmer plugin
issue #78
2015-02-18 11:16:53 -05:00
Josh de Leeuw
be74b923ec modify docs for snapsvg
issue #113
2015-02-18 11:16:35 -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
d42a8b2598 Merge pull request #112 from mariansauter/patch-2
added jspsych-visual-search-circle to css
2015-02-11 12:44:37 -05:00
Josh de Leeuw
b4cb51294a Merge pull request #111 from mariansauter/patch-1
CRITICAL bugfix jspsych-visual-circle-search
2015-02-11 12:44:25 -05:00
mariansauter
ed55a92ef2 added jspsych-visual-search-circle to css 2015-02-11 16:52:42 +01:00
mariansauter
a10f881847 CRITICAL bugfix jspsych-visual-circle-search
line 79: "display_element.appent" wasn't working, spelling error, makes whole plugin unrunnable
2015-02-11 16:42:10 +01:00
Josh de Leeuw
c780dd4557 add sample method
issue #102
2015-02-05 17:19:08 -05: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
686a6bcdaf fix issues with html content rendering in displayData
issue #99
2015-02-05 17:00:22 -05:00
Josh de Leeuw
1850f94128 docs for randomization.shuffle
issue #100
2015-02-05 16:55:39 -05:00
Josh de Leeuw
0849f8bd9f add randomization.shuffle function
issue #100
2015-02-05 16:52:16 -05:00
Josh de Leeuw
45820a5249 comments removed 2015-02-05 16:49:21 -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
6a634244e3 temp fix to prevent non AudioContext browsers from breaking
issue #95
2014-11-14 15:28:33 -05:00
Josh de Leeuw
14fbe9d67f allow keys as strings
issue #97
2014-11-14 15:19:45 -05:00
Josh de Leeuw
55f1d3c5d6 add convertKeyCharacterToKeyCode method 2014-11-14 15:14:48 -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
e00b60c570 fix documentation
issue #97
2014-11-13 08:43:02 -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
1530db92c3 add styles for survey-likest plugin 2014-11-11 12:13:47 -05:00
Josh de Leeuw
d7af7609f3 Merge pull request #93 from jodeleeuw/audio
Audio
2014-11-11 10:29:30 -05:00
Josh de Leeuw
8ca0e2576c adds a check in init function to see if all audio is loaded 2014-11-11 10:18: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
bb1379b5e4 adding audio support functions to core 2014-11-11 08:37:57 -05:00
Josh de Leeuw
a139b13927 starting to put together an audio plugin 2014-11-10 17:13:51 -05:00
Josh de Leeuw
016be46bca Merge pull request #91 from jodeleeuw/master
sync dev with master
2014-11-10 16:36:26 -05:00
Josh de Leeuw
115aac3a2c update version info 2014-11-10 09:20:19 -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
ae6c9febda add multi-tim-multi-response docs 2014-11-10 09:10:57 -05:00
Josh de Leeuw
bacaa87072 add go/no-go task tutorial to docs 2014-11-06 09:44:03 -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
f7d02198d0 fix issue with flatten data
Fixes #85
2014-10-30 16:06:07 -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