HoshinoKoji/jsPsych
1
0
Fork 0
mirror of https://github.com/jspsych/jsPsych.git synced 2025-05-10 11:10:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,894 Commits 14 Branches 506 Tags 58 MiB
main
Commit Graph

359 Commits

Author SHA1 Message Date
Josh de Leeuw
562e993f9c adding a calibration routine, but it's not great 2021-01-02 17:20:21 -05:00
Josh de Leeuw
0ac9fc0d5a add event hooks in jspsych.js 2021-01-02 13:55:50 -05:00
Josh de Leeuw
26a70adc05 filling out extension code 2021-01-02 13:44:28 -05:00
Josh de Leeuw
9c22731413 begin working on webgazer extensions 2021-01-01 21:26:03 -05:00
Becky Gilbert
e9d632cfc2 add example with custom button and page labels# 2020-12-08 15:13:36 -08:00
Becky Gilbert
f795f29cc9 add info to prompts, add post_trial_gap 2020-12-08 15:02:30 -08:00
Becky Gilbert
3d77e2f131 fix incorrect text_answer 2020-12-08 14:50:51 -08:00
Becky Gilbert
c026c62ea0 move img width from <style> to param 2020-12-08 14:44:24 -08:00
Becky Gilbert
a20d6f9e04 move img width from <style> to param, add pre_trial text 2020-12-08 14:40:03 -08:00
Becky Gilbert
5fc38b2a04 fix typo and formatting, remove unnecessary <style> 2020-12-08 14:22:10 -08:00
Becky Gilbert
fd8a048139 move img width from <style> to param 2020-12-08 14:18:32 -08:00
Becky Gilbert
887dcbd627 move img width from <style> to parameter 2020-12-08 14:13:09 -08:00
Becky Gilbert
633682b335 center the color divs in prompts 2020-12-07 16:14:22 -08:00
Becky Gilbert
d75717ac5b remove use_webaudio: false from audio examples 2020-12-02 17:46:13 -08:00
Becky Gilbert
4f06465ba3 fix indentation 2020-12-02 17:11:04 -08:00
Becky Gilbert
d9437c1c11 change sources parameter name to stimulus 2020-12-01 16:56:12 -08:00
Daiichiro Kuroki
efac416602 Changed the stim, sort_area, and canvas sizes in the free-sort demo for touch devices. 2020-11-26 10:25:01 +09:00
Becky Gilbert
32cdeae645
Merge branch 'master' into fix-consecutive-images 2020-11-25 10:50:26 -08:00
Becky Gilbert
bbef9ef9d2
Merge pull request #1203 from jspsych/freesort 
Updates to free-sort plugin
 2020-11-25 09:48:05 -08:00
Becky Gilbert
1aaee22324
Merge pull request #1136 from awhug/master 
Add maxdiff plugin
 2020-11-20 15:09:39 -08:00
Becky Gilbert
a7bed07cf4 add examples to demo new parameters 2020-11-19 18:25:48 -08:00
Becky Gilbert
175eaab10d
Merge pull request #1018 from kohler-visual-neuroscience-lab/master 
updates to free-sort plugin, new functionality
 2020-11-18 17:46:02 -08:00
Peter J. Kohler
a1ca6a8406 fixed above/below 2020-11-18 19:41:43 -05:00
Becky Gilbert
c367531d40 initial commit 2020-11-10 14:06:47 -08:00
Becky Gilbert
af8d531259 add render_on_canvas option, fix maintain_aspect_ratio - fixes #891 #969 #1172 2020-11-06 17:55:06 -08:00
Becky Gilbert
dbb001c0c7
Merge branch 'master' into respond-while-playing 2020-11-04 11:27:50 -08:00
Becky Gilbert
879f6a7cb5 fix problem with non-zero video start time in FF 2020-10-31 15:37:27 -07:00
Becky Gilbert
6396036c9e add response_allowed_while_playing parameter - #1137 2020-10-26 14:47:30 -07:00
awhug
1467f3b1e4 Initial pass of maxdiff plugin 2020-10-21 16:08:11 +08:00
Becky Gilbert
ee228b1419 change timing_response to trial_duration - #1096 2020-10-12 12:36:21 -07:00
Becky Gilbert
121428cf31 change start param to slider_start 2020-10-11 12:16:39 -07:00
Becky Gilbert
91f8350047 revert unintentional change 2020-10-11 10:27:35 -07:00
Becky Gilbert
f92b9214b5 fixed inconsistencies in parameter info 2020-10-11 10:26:10 -07:00
Becky Gilbert
1bc3ac337c
Merge pull request #721 from vijaymarupudi/html5-fix 
Removed closing </link> tag
 2020-10-08 17:20:25 -07:00
Becky Gilbert
d612a90f4f fix typo 2020-10-02 11:41:59 -07:00
Becky Gilbert
c1dc2295ad Merge branch 'master' of https://github.com/jspsych/jsPsych 2020-10-02 11:36:27 -07:00
Becky Gilbert
ae3aafd6ec fix formatting 2020-10-02 11:36:16 -07:00
Christian
8d8ee8ae55
survey-html-form: add autofocus parameter 
Users can provide the id of an element to focus on when the
slide is displayed. While HTML5 has an autofocus parameter
it is not universal and not all browsers support it. This
solution should work across browsers and is more in keeping
with the jsPsych object style.

Issue #1062
 2020-09-23 21:05:42 -07:00
Peter J. Kohler
3e752a73f8 updated free-sort-example 2020-08-29 17:08:38 -04:00
Vijay Marupudi
9c4e26173e Removed closing </link> tag 2020-05-26 20:20:03 -05:00
Josh de Leeuw
e714214fc4 check TOC; make necessary changes #617 2019-07-15 14:55:36 -04:00
Josh de Leeuw
5a56431f8d add name option for survey plugins #608 2019-07-15 12:06:10 -04:00
Josh de Leeuw
c83e115f9b add name option to survey-text #608 2019-07-15 10:54:26 -04:00
Josh de Leeuw
6cf949766a adding documentation for video plugins #636 2019-07-12 17:02:06 -04:00
Josh de Leeuw
68d8c40ea6 remove old video plugin #636 2019-07-12 11:39:20 -04:00
Josh de Leeuw
7e33af85cb add video-* plugins #636 2019-07-12 11:38:21 -04:00
Josh de Leeuw
c126b58f0a implement scale_width #633 2019-07-11 10:29:47 -04:00
Josh de Leeuw
02113068f9 delete temporary test 2019-07-05 11:50:49 -04:00
Josh de Leeuw
b4bfb1852d fixes timeline vars in conditional functions #574 2019-07-05 11:43:40 -04:00
Josh de Leeuw
208ecf0365 some minor tweaks to survey-html-form plugin 2019-07-04 15:24:37 -04:00
Josh de Leeuw
7d01510a24
Merge pull request #602 from jansim/master 
Added very simple alternative jspsych-survey-html-form plugin
 2019-07-04 15:19:13 -04:00
Josh de Leeuw
9bed32fb0f implements settable width for sliders (#631) 2019-07-04 15:10:52 -04:00
Josh de Leeuw
381d2778b1 Merge branch 'pr/575' 2019-07-02 22:15:50 -04:00
Josh de Leeuw
9da8c452f2 implement image size settings for image plugins #560 2019-07-02 21:55:15 -04:00
Josh de Leeuw
bde84139bf implements randomize order for all survey plugins, including tests #305 2019-07-02 17:03:24 -04:00
Josh de Leeuw
fd52dcb481 change examples to use placeholder #627 2019-07-02 11:08:46 -04:00
Josh de Leeuw
d094d1d6be add random order for -text #305 2019-07-01 13:46:32 -04:00
Josh de Leeuw
e80ea04b04 working on randomization of survey orders #305 2019-07-01 13:33:07 -04:00
Josh de Leeuw
fd3c15c8ce implementing random order for survey-likert (#305) 2019-06-19 17:03:27 -04:00
Josh de Leeuw
7e73a2fcbd example of manual preloading 2019-06-18 16:57:11 -04:00
Josh de Leeuw
627b4b2d50
Merge pull request #555 from sprengholz/master 
Cloze Test
 2019-05-31 16:46:53 -04:00
Josh de Leeuw
c506f35683 update survey-text example to test multi page issue 2019-04-14 19:49:22 -04:00
Jan Simson
f4b4e7301c imrpoved example code for jspsych-survey-html-form plugin 2019-03-20 15:07:22 -04:00
Jan Simson
1b36f56daa Added jspsych-survey-html-form plugin 2019-03-14 16:17:51 -04:00
Josh de Leeuw
248c5dcaab fix lexical decision example 2018-12-11 10:35:28 -05:00
CML2
8408f59746 Changed to lowercase rdk and fixed border bug 2018-11-27 16:19:53 -08:00
Josh de Leeuw
8c5d83b258 implement required parameter for survey-text plugin (#460) 2018-11-09 14:10:09 -05:00
Josh de Leeuw
e59895cb8e updates for video preloading 2018-10-12 11:48:01 -04:00
Josh de Leeuw
b551f99f12
Merge branch 'master' into master 2018-10-12 11:19:51 -04:00
Josh de Leeuw
cb030f3ed7
Merge pull request #564 from vrsivananda/add-RDK 
Added functionality for RDK to take in javascript character codes for…
 2018-10-04 15:23:52 -04:00
Josh de Leeuw
2e69a17693 update lexical decision to help test #563 2018-10-04 14:07:18 -04:00
CML2
3d708804b2 changed timing_post_trial to post_trial_gap 2018-09-20 13:31:55 -07:00
CML2
7a5c980cbf Added functionality for RDK to take in javascript character codes for choices and correct_choice parameters 2018-09-07 17:07:00 -07:00
Philipp Sprengholz
53321cb9d5 Reworked documentation, added test file 2018-08-05 12:25:34 +02:00
Philipp Sprengholz
73c0f24be4 Simplified cloze plugin design 2018-08-02 07:20:47 +02:00
Philipp Sprengholz
72c84130c5 Refined the cloze structure and added both example and doc files 2018-07-13 23:15:38 +02:00
andy
07cd15dbca preload video + non-preloaded video ability 2018-06-30 20:45:30 +01:00
Josh de Leeuw
25d23a8e0d adding RDK plugin 2018-06-25 22:08:47 -04:00
Josh de Leeuw
fe29d2b255
Merge pull request #491 from vrsivananda/add-RDK 
Added RDK plugin
 2018-06-25 22:02:19 -04:00
Josh de Leeuw
d96252b157
Merge pull request #501 from mjaquiery/instruction-pagenum 
Instruction page numbers (feature requested in #371)
 2018-06-25 21:51:06 -04:00
Josh de Leeuw
176424df82 fixes #545 2018-06-25 15:39:40 -04:00
andy
22bd4961d4 working preloaded video 2018-05-31 09:56:42 +01:00
Sivananda Rajananda
10608969b7 Fixed multiple apertures nSets parameter and function 2018-05-22 11:35:51 -04:00
CML2
bab507b9f6 Fixed lag for multiple apertures RDK 2018-05-08 15:27:37 -07:00
Josh de Leeuw
fea3015fbd fixed implementation of start/stop for all browsers #517 2018-04-17 21:32:18 -04:00
Josh de Leeuw
810df6c182 fix minor errors; step version #516 2018-04-17 10:38:34 -04:00
CML2
7b444afd59 Added multiple apertures and opposite coherence 2018-04-04 16:23:03 -07:00
Josh de Leeuw
b25de70bba new test for survey-text 2018-03-18 22:47:01 -04:00
saizo aoyagi@desktop-iniad1
acfb5c88fa Add a parameter for getting a word instead of a function 2018-02-27 14:56:50 +09:00
Josh de Leeuw
f3d5a5043d make webaudio optional #508 2018-02-18 16:19:09 -05:00
mjaquiery
a2d997841f Tweaks 
* default show_page_number to false for back-compatability
* added a line in the documentation describing page numbering
 2018-02-09 16:22:21 +00:00
mjaquiery
f15cf80afb Revert "Added canvas-slider-response" 
This reverts commit 76bcdc60d2.
 2018-02-09 13:05:14 +00:00
mjaquiery
76bcdc60d2 Added canvas-slider-response 
Added the **jspych-canvas-slider-response** plugin and example files. These allow canvases to be used as stimuli by passing a function as the stimulus which handles the drawing activity.
 2018-02-08 13:39:23 +00:00
Matt Jaquiery
24741a40c8
Update demo-simple-rt-task.html 
* Fixed wonky display on the instructions screen caused by a div having 'class' rather than 'style' set to 'float: right'
 2018-02-06 14:28:49 +00:00
Josh de Leeuw
bffbb67636 getData() -> get() 2018-01-12 14:04:37 -05:00
Sivananda Rajananda
e2a028f862 Added RDK plugin 2018-01-10 14:23:08 -08:00
Josh de Leeuw
065e74a2c4 update examples 2018-01-03 14:06:20 -05:00
Josh de Leeuw
6abdd01d7e remove XAB plugin 2018-01-03 14:05:11 -05:00
Josh de Leeuw
2690355e4f removing refs to text plugin 2017-12-20 13:12:17 -05:00
Josh de Leeuw
676371e4ec fixing old documentation 2017-12-20 11:48:18 -05:00
Josh de Leeuw
23b0f9ea83 support custom start values #472 2017-12-07 16:35:07 -05:00
Josh de Leeuw
6cce1d3898 add audio demos, fixes #481 2017-12-06 12:57:33 -05:00
Josh de Leeuw
e6fe32824c Update jspsych-categorize-html.html 2017-09-15 13:26:18 -04:00
Josh de Leeuw
09ad9296c4 update grid-scene docs and demo 2017-09-14 22:27:55 -04:00
KristinDiep
feef97c170 test categorize-animation 2017-07-28 12:05:14 -04:00
KristinDiep
5df6166473 Update survey plugin docs 2017-07-27 14:59:32 -04:00
KristinDiep
69f509b396 fixed examples 2017-07-27 11:10:56 -04:00
KristinDiep
e537037af7 updated questions for survey plugins 2017-07-24 09:58:22 -04:00
KristinDiep
b7dca21ecf fix merge conflict 2017-07-23 13:06:37 -04:00
KristinDiep
bf1da9375d added nested params in survey plugins 2017-07-23 13:04:39 -04:00
Josh de Leeuw
62a39f18db fix #449 2017-07-17 21:51:29 -04:00
Josh de Leeuw
f9682859c2 reconstruction example #449 2017-07-17 21:47:50 -04:00
Josh de Leeuw
eeaa2bba29 remove class=center-content 2017-07-17 21:45:32 -04:00
KristinDiep
505121e455 edited examples 2017-07-17 10:19:41 -04:00
KristinDiep
d0ea893d1a center-content not needed 2017-07-12 14:34:50 -04:00
KristinDiep
c3d616283f added demos 2017-07-12 14:29:47 -04:00
KristinDiep
f21ad81d1e removed param block under plugin.trial 2017-07-12 14:29:47 -04:00
KristinDiep
e6b55d7ce2 created demos 2017-07-12 10:21:35 -04:00
KristinDiep
496b2c8a37 all test suites(except for timeline-variables.test) working 2017-07-11 10:14:21 -04:00
KristinDiep
c46b9263aa iat plugin example works 2017-07-10 15:08:29 -04:00
KristinDiep
cbb0643a95 some changes 2017-07-10 14:43:43 -04:00
KristinDiep
670b691da2 implemented plugin.info, some examples not working 2017-07-10 14:43:04 -04:00
Josh de Leeuw
756c88a07f better timing parameter names #425 2017-07-10 14:00:24 -04:00
KristinDiep
9e715e2457 iat-image, iat-html, image-keyboard-response tests done 2017-07-07 14:46:33 -04:00
Josh de Leeuw
a764ba75a4 More work on plugin ambiguity #422 2017-07-07 12:17:09 -04:00
Josh de Leeuw
2011677eba Merge pull request #415 from kristiyip/master 
Added plugins to .yml
 2017-07-06 15:52:01 -04:00
Josh de Leeuw
23397a0da7 finish separation of sample method #421 2017-07-06 15:48:33 -04:00
KristinDiep
48d7a36fcf getting fork up to date 2017-07-06 15:34:19 -04:00
Josh de Leeuw
fe9a767bb6 remove slider response (#422) 2017-07-06 15:32:53 -04:00
Josh de Leeuw
6ad1e0e2ab more plugin updating #422 2017-07-06 15:32:53 -04:00
Josh de Leeuw
69db40965e slider plugin #403 2017-07-06 15:32:19 -04:00
Josh de Leeuw
950a501800 remove similarity plugin #403 2017-07-06 15:32:03 -04:00
Josh de Leeuw
7a1a81d087 update examples; tweak plugin fixes 2017-07-06 15:31:31 -04:00
Josh de Leeuw
1947aa79c3 update examples for v6.0 2017-07-06 15:31:24 -04:00
Josh de Leeuw
666fd53de2 minor cleanup 2017-07-06 15:30:32 -04:00
Josh de Leeuw
22120979fd remove slider response (#422) 2017-07-06 14:53:59 -04:00
Josh de Leeuw
abbe811a66 more plugin updating #422 2017-07-06 14:51:57 -04:00
KristinDiep
1d0742e676 split iat plugin 2017-07-06 13:59:09 -04:00
KristinDiep
da04f658b5 edit .yml 2017-07-06 13:59:08 -04:00
KristinDiep
ac965d4523 instructions demo 2017-07-06 13:59:08 -04:00
KristinDiep
03d0e7e197 flanker demo and code 2017-07-06 13:59:07 -04:00
Josh de Leeuw
7f62f0b52b more plugin refactoring #422 2017-07-06 13:48:00 -04:00
Josh de Leeuw
045560d2f5 more plugin work #422 2017-07-06 13:06:18 -04:00
Josh de Leeuw
4eb03b7f36 remove ambiguity #422; add btn disabled css 2017-07-06 12:58:48 -04:00
Josh de Leeuw
2211ea1321 removing ambiguous parameters #422 2017-07-06 12:44:17 -04:00
Josh de Leeuw
104fcf3e98 rename plugin file to match plugin name 2017-07-01 23:09:20 -04:00
Josh de Leeuw
3ade5435d4 add min, max, step options #403 2017-07-01 23:06:32 -04:00
Josh de Leeuw
d882b4aa36 rename, update slider plugin #403 2017-07-01 23:01:21 -04:00
Josh de Leeuw
b6ad52c990 update IAT code to calculate D #400 2017-07-01 00:19:44 -04:00
Josh de Leeuw
bc96e8483f Merge pull request #395 from GavinQ1/master 
Deal with css properties issues
 2017-06-30 23:30:16 -04:00
Josh de Leeuw
d9b3deb582 remove palmer plugin - fixes #401 
Snap library is not handling event listeners correctly, or some other
change to jsPsych broke compatibility. Either way, this plugin isn't
used enough to warrant the effort to make it compatible right now.
 2017-06-30 23:24:10 -04:00
Josh de Leeuw
52f5414ac4 remove example #404 2017-06-26 13:23:23 -04:00
Josh de Leeuw
a70a858526 slider plugin #403 2017-06-26 12:10:56 -04:00
Josh de Leeuw
2c9c849e66 update example 2017-06-26 11:46:44 -04:00
Josh de Leeuw
e36b2bdd63 remove similarity plugin #403 2017-06-26 11:46:02 -04:00
Josh de Leeuw
8748bdb999 update example 2017-06-25 21:08:40 -04:00
Josh de Leeuw
1e9e6fc54a update examples 2017-06-25 21:08:20 -04:00
Josh de Leeuw
e347fe1f75 remove examples that are more like unit tests 2017-06-25 21:08:11 -04:00
Josh de Leeuw
89f118cf01 update examples 2017-06-25 20:54:04 -04:00
Josh de Leeuw
07ffe2329a update examples; tweak plugin fixes 2017-06-24 23:53:50 -04:00
Josh de Leeuw
0e6311d9a9 update examples for v6.0 2017-06-21 23:48:08 -04:00
Josh de Leeuw
746f00e148 update snap library to v0.5.1 2017-06-21 23:47:19 -04:00
Josh de Leeuw
cb602dbc87 minor cleanup 2017-06-21 23:17:36 -04:00
Josh de Leeuw
7f9377c7c4 update srt mouse with extra option 2017-06-21 15:38:17 -04:00
KristinDiep
b2fe7100df fixed IAT plugin and doc 2017-06-21 11:16:47 -04:00
Josh de Leeuw
8f34d44b28 adjust plugin examples for v6 2017-06-21 09:10:56 -04:00
Josh de Leeuw
b2b5436c99 updating examples for v6 2017-06-20 12:02:10 -04:00
Josh de Leeuw
194d7f0881 remove outdated example 2017-06-19 21:48:59 -04:00
Josh de Leeuw
9810dab604 fixes #387 with proper focus 2017-06-19 14:46:17 -04:00
GavinQ1
4cead9621d Deal css properties issues 2017-06-19 12:43:13 -04:00
Josh de Leeuw
005493c39b a few minor bug fixes for #374, #135 2017-06-19 11:59:33 -04:00
Josh de Leeuw
1bf201bd7f fix bug for html5 audio use in single-audio 2017-06-13 10:00:58 -04:00
Josh de Leeuw
6c6495c783 fix missing comma 2017-06-13 10:00:58 -04:00
Josh de Leeuw
4e44c489c6 fix example file 2017-06-13 10:00:57 -04:00
Josh de Leeuw
87f822ec3e fix timeline variables example 2017-06-13 10:00:57 -04:00
Josh de Leeuw
d6b2d9d5e5 add srt-mouse plugin #390 2017-06-13 10:00:57 -04:00
KristinDiep
18a380874c better logic 2017-06-13 09:58:35 -04:00
KristinDiep
98239311bc fixed example 2017-06-02 14:28:50 -04:00
KristinDiep
a1b8e8e3cd fixed logic and tests 2017-06-02 14:27:14 -04:00
KristinDiep
cba01953f8 Merge branch 'master' of https://github.com/jodeleeuw/jsPsych 
Need to update
 2017-06-02 09:17:37 -04:00
Josh de Leeuw
3b47fe3bd8 show data after completed example 2017-06-01 14:55:42 -04:00
eamoncaddigan
0a081f424d Redundant demo using old fullscreen example code. #380 2017-05-30 10:38:40 -04:00
Josh de Leeuw
934f394de0 first pass at #384 2017-05-27 18:09:28 -04:00
KristinDiep
0ef858450c Merge branch 'master' of https://github.com/kristiyip/jsPsych 
Nee to update.
 2017-05-26 11:21:55 -04:00
Josh de Leeuw
a62a2e771e add example file for testing #288 , #370 2017-05-25 13:59:43 -04:00
Werner Sævland
588786abf6 Minor error corrected 2017-05-19 14:42:10 +02:00
Josh de Leeuw
fb8b7d2200 show text input instead of textarea when rows=1 2017-05-18 11:28:06 -04:00
Josh de Leeuw
d5fd16be7c working example of fullscreen 2017-05-01 16:35:41 -04:00
KristinDiep
4b8d332762 Merge remote-tracking branch 'upstream/master' 
Need to update fork with upstream.
 2017-04-17 17:11:10 -04:00
KristinDiep
3881da6df8 created tests 2017-04-12 22:58:36 -04:00
KristinDiep
0b2e14781f moved age folder to imgand removed container div 2017-04-11 08:59:36 -04:00
KristinDiep
0d3b935bb1 Now works and allows users to press any key to continue 2017-04-06 02:03:20 -04:00
KristinDiep
b7d43b3280 added 'other key' option 2017-04-01 16:14:57 -04:00
KristinDiep
64f8fc7f9f transferred iat plugin to forked repo of jsPsych 2017-03-30 23:45:23 -04:00
Josh de Leeuw
84de9aed7e add resize plugin #352 2017-03-20 13:58:41 -04:00
Josh de Leeuw
47f4e61ac4 allows required for all questions on page #348 2017-03-14 13:09:31 -04:00
Josh de Leeuw
05fb12982e check multiple questions 2017-03-04 09:45:38 -05:00
Josh de Leeuw
7a65ab9aaf fix paths, add css 2017-03-04 09:33:55 -05:00
Xiaolu bai
7ee52ffa34 Adds new line at the end 2017-02-13 14:48:23 -08:00
Xiaolu bai
896fba4b4f Adds new line at the end 2017-02-13 14:48:02 -08:00