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

702 Commits

Author SHA1 Message Date
Sivananda Rajananda
99ef8a149f
Rename jspsych-RDK.js to jspsych-rdk.js 2018-11-27 16:49:09 -08: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
CML2
5fe2a5f97e Fixed opposite_coherence function 2018-11-01 19:45:59 -07: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
501a5be52a update all to performance.now() - #492 2018-10-09 16:13:59 -04:00
Josh de Leeuw
f052f23633 remove form plugin 2018-10-04 15:27:33 -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
15d1bd4bae
Merge pull request #559 from tbrotherm/patch-1 
Update jspsych-external-html.js
 2018-10-04 14:08:48 -04:00
Josh de Leeuw
6b88af120e fix slider parameter type #571 2018-10-04 13:44:12 -04:00
CML2
b7e359510e Fixed bugs for backgroundColor and response_ends_trial 2018-09-13 14:30:48 -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
Hitoshi Tominaga
4919c90ab1
Update jspsych-external-html.js 
I found a minor bug on line 69.
Error: if (trial.cont_key) { document.removeEventListener('keydown', key_listener); }
Correct: if (trial.cont_key) { display_element.removeEventListener('keydown', key_listener); }
Because of this, some eventListeners continue working after finishing this plugin.
 2018-08-22 19:14:00 +09: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
Josh de Leeuw
b85c5e754e fix additional bug in #553 2018-08-01 15:47:11 -04:00
Josh de Leeuw
1b7272e5de fix bug with backward button in instructions plugin (fixes #553) 2018-08-01 15:32:44 -04:00
Josh de Leeuw
0b5b3004de implement async option for call-function plugin #552 2018-07-31 10:48:54 -04:00
Philipp Sprengholz
72c84130c5 Refined the cloze structure and added both example and doc files 2018-07-13 23:15:38 +02:00
Philipp Sprengholz
503c4cc9e7 Added cloze plugin 2018-07-13 22:17:43 +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
b6009b2de9 docs for #532 2018-06-25 21:37:32 -04:00
Josh de Leeuw
3c73ed41fd
Merge pull request #534 from onkeltom/fix-external-html-plugin 
Fix #532 to allow script on external-html pages to be executed
 2018-06-25 21:34:55 -04:00
Josh de Leeuw
243c49dc74 fixes #544 2018-06-25 14:42:40 -04:00
Josh de Leeuw
c2e55bd52b fixes #533 2018-06-25 14:28:05 -04:00
andy
22bd4961d4 working preloaded video 2018-05-31 09:56:42 +01:00
andy
5a6b20f695 untested preload video mod 2018-05-30 20:55:21 +01:00
Dominik Strohmeier
5698002b3e Fix #532 to allow script on external-html pages to be executed optionally in a external-html plugin trial 
Issue #532 addresses the issue that scripts included in the remote page will not be executed via the XMLHttpRequest() in the external-html script.

We will need to relocate the content of all scripts by relocating the content through DOM manipulation. The execution is optional and can be controlled through the new execute_Script parameter.
 2018-05-30 10:08:58 +02: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
7dba81b83b completes #520 2018-04-20 10:55:09 -04:00
Josh de Leeuw
fea3015fbd fixed implementation of start/stop for all browsers #517 2018-04-17 21:32:18 -04:00
CML2
7b444afd59 Added multiple apertures and opposite coherence 2018-04-04 16:23:03 -07:00
Ilya Vorontsov
ac98f87d06 default values in survey-text are now specified not in arrays 2018-02-17 00:36:32 +03: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
9a655dc93b Enable hiding page numbers 
* Page numbers can now be turned off by setting show_page_number to false
 2018-02-09 13:11:16 +00:00
mjaquiery
f15cf80afb Revert "Added canvas-slider-response" 
This reverts commit 76bcdc60d2.
 2018-02-09 13:05:14 +00:00
mjaquiery
982736bd97 Display pagenumber on instructions 
* Page numbers now show on multi-page instructions
* On the first page of instructions where backwards navigation is allowed, the 'previous' button is shown but disabled for visual consistency with  subsequent pages
 2018-02-09 12:52:48 +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
Josh de Leeuw
5d7614667e prettify html -> HTML 2018-01-23 13:58:17 -05:00
Josh de Leeuw
5c71cbaba0 fixing plugin parameter type errors 2018-01-19 21:39:55 -05:00
Josh de Leeuw
583b9a9d1b fix #490 2018-01-11 10:45:57 -05:00
Sivananda Rajananda
e2a028f862 Added RDK plugin 2018-01-10 14:23:08 -08:00
Josh de Leeuw
f87db559ed better display sync for button plugins 2018-01-06 16:49:50 -05:00
Josh de Leeuw
48f72c558f fix name bug 2018-01-03 14:06:26 -05:00
Josh de Leeuw
4c8e2a536b use null instead of -1 2018-01-03 14:06:02 -05:00
Josh de Leeuw
d685daa7ad bug fixes on survey text plugin 2018-01-03 14:05:53 -05:00
Josh de Leeuw
fa3cae1eea fix key comparison bug 2018-01-03 14:05:29 -05:00
Josh de Leeuw
6abdd01d7e remove XAB plugin 2018-01-03 14:05:11 -05:00
Josh de Leeuw
ae580f7f60 record null value correctly 2018-01-03 12:47:44 -05:00
Josh de Leeuw
bf0627075e fix preloading issue; display streamline 2018-01-03 12:47:34 -05:00
Josh de Leeuw
97467a1f0d fixing bad default values to more descriptive ones #488 2018-01-03 12:02:10 -05:00
Josh de Leeuw
ca3328ec82 some more docs updates 2018-01-01 22:12:41 -05:00
Josh de Leeuw
27ae629aa6 fixed indentation 2018-01-01 22:08:58 -05:00
Josh de Leeuw
fea8d270ca save stimulus info 2018-01-01 22:04:11 -05:00
Josh de Leeuw
d9455ed2c0 updating plugin documentation 2017-12-30 23:35:37 -05:00
Josh de Leeuw
35bff7baa3 fixes #474 2017-12-07 20:39:33 -05:00
Josh de Leeuw
23b0f9ea83 support custom start values #472 2017-12-07 16:35:07 -05:00
Josh de Leeuw
a4c0135a4a record stimulus #473 2017-12-06 14:58:44 -05:00
Josh de Leeuw
fd78450ecf remove audio buffer time, fixes #476 2017-12-06 12:57:15 -05:00
Josh de Leeuw
de9dff4e4a
update template for plugin.info method 2017-11-22 12:40:50 -05:00
Josh de Leeuw
6aea5c78bf fix errors in plugin 2017-10-12 13:12:14 -04:00
Josh de Leeuw
3affd77ddf button label defaults #471 2017-09-20 09:37:29 -04:00
Josh de Leeuw
b53dae0119 Merge branch 'master' of https://github.com/jspsych/jsPsych 2017-09-01 10:01:15 -04:00
Josh de Leeuw
b1d76d3f30 fix abs() issue with shrinking box 2017-09-01 10:01:11 -04:00
andrewheusser
13b4f88786 added event handler to end trial when a stop time is specified 2017-08-25 15:32:38 -04:00
Josh de Leeuw
8f4b42fa8c Merge branch 'master' of https://github.com/jspsych/jsPsych 2017-08-02 11:57:04 -04:00
Josh de Leeuw
7e2db2c1c8 fixes #458 2017-08-02 11:57:00 -04:00
KristinDiep
ec72fade4b pretty name in survey plugins 2017-07-28 13:34:54 -04:00
KristinDiep
5df6166473 Update survey plugin docs 2017-07-27 14:59:32 -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
1b9ed49eca multi-select example #449 2017-07-17 21:50:04 -04:00
Josh de Leeuw
f9682859c2 reconstruction example #449 2017-07-17 21:47:50 -04:00
KristinDiep
505121e455 edited examples 2017-07-17 10:19:41 -04:00
KristinDiep
41db219c89 pretty name and description, no_function taken out 2017-07-13 19:17:27 -04:00
KristinDiep
26d33b6ec8 tests pass 2017-07-12 14:55:57 -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
Josh de Leeuw
5d888912f9 starts #432 2017-07-12 09:58:27 -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
6f1c409c54 html-slider-response test finished 2017-07-10 10:43:57 -04:00
KristinDiep
13930f9e40 added params to image-slider-response 2017-07-10 09:12:46 -04:00
Josh de Leeuw
74da90c320 remove palmer plugin 2017-07-09 23:31:44 -04:00
Josh de Leeuw
a55d0448f9 remove jquery comment from form plugin 2017-07-09 23:05:58 -04:00
Josh de Leeuw
a1567ceba7 remove array brackets from plugin types 2017-07-09 21:15:22 -04:00
Josh de Leeuw
7433638dc6 remove old merge conflict (??) stuff 2017-07-07 15:10:14 -04:00
Josh de Leeuw
4863f2e9c3 remove evaluateFunctionParameter 2017-07-07 14:54:47 -04:00
KristinDiep
225fbf7474 image-button response test 2017-07-07 14:46:33 -04:00
KristinDiep
9e715e2457 iat-image, iat-html, image-keyboard-response tests done 2017-07-07 14:46:33 -04:00
KristinDiep
598174d0a8 audio and html slider response 2017-07-07 14:46:33 -04:00
Josh de Leeuw
fd6b66063c remove ambiguity for xab/sd #422 2017-07-07 14:13:14 -04:00
Josh de Leeuw
d6d23133ab fix query string bug 2017-07-07 13:23:29 -04:00
Josh de Leeuw
cb90bde564 param clarification #422 2017-07-07 12:23:02 -04:00
Josh de Leeuw
55566c8b6f remove text plugin (redundant with html-keyboard-response) 2017-07-07 12:22:53 -04:00
Josh de Leeuw
a764ba75a4 More work on plugin ambiguity #422 2017-07-07 12:17:09 -04:00
Josh de Leeuw
35827773a2 fix bug when URL has query string 2017-07-07 11:08:54 -04:00
Josh de Leeuw
4473a77ad2 rename html -> external-html 2017-07-06 15:32:53 -04:00
Josh de Leeuw
eca09d89be remove single-stim #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
6b3a49d33d rename plugin file to match plugin name 2017-07-06 15:32:49 -04:00
Josh de Leeuw
fcbb1fa523 remove multi-picture plugin #404 2017-07-06 15:32:25 -04:00
Josh de Leeuw
69db40965e slider plugin #403 2017-07-06 15:32:19 -04:00
Josh de Leeuw
97e2792b81 change default button label 2017-07-06 15:32:18 -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
a1fd2fcef4 change default button label 2017-07-06 15:31:16 -04:00
Josh de Leeuw
a4de99e19d fix backwards plugin 2017-07-06 15:29:32 -04:00
Josh de Leeuw
183d357b4a update srt mouse with extra option 2017-07-06 15:28:55 -04:00
Josh de Leeuw
7518cfb7ff fix CI build 2017-07-06 15:27:37 -04:00
Josh de Leeuw
f5907c0bb3 to show CI error 2017-07-06 15:27:37 -04:00
Josh de Leeuw
227b5996e1 fix button-response tests 2017-07-06 15:27:37 -04:00
KristinDiep
31d865e3da file for audio-button-response 2017-07-06 14:39:06 -04:00
KristinDiep
6cef974710 created files for different kinds of stimulus 2017-07-06 14:15:21 -04:00
KristinDiep
1d0742e676 split iat plugin 2017-07-06 13:59:09 -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
caca99335d clarify parameter type #423 2017-07-06 09:54:05 -04:00
Josh de Leeuw
bd87503555 adds new plugin, fixes #409 2017-07-02 22:08:23 -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
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
991674be45 fixes #405 2017-06-26 13:27:41 -04:00
Josh de Leeuw
bdb797f473 remove multi-picture plugin #404 2017-06-26 13:21:49 -04:00
Josh de Leeuw
a70a858526 slider plugin #403 2017-06-26 12:10:56 -04:00
Josh de Leeuw
47c890e429 change default button label 2017-06-26 11:46:31 -04:00
Josh de Leeuw
e36b2bdd63 remove similarity plugin #403 2017-06-26 11:46:02 -04:00
Josh de Leeuw
acce4407e5 fixes #406 2017-06-25 22:50:05 -04:00
Josh de Leeuw
408d574a35 clean HTML reset 2017-06-25 20:53:53 -04:00
Josh de Leeuw
58cfe0d7e6 clean HTML reset 2017-06-25 20:53:46 -04:00
Josh de Leeuw
207292bd11 better stimulus generation method 2017-06-25 20:53:34 -04:00
Josh de Leeuw
8e74f0391c fix extra presentation of X 2017-06-25 20:53:25 -04:00
Josh de Leeuw
07ffe2329a update examples; tweak plugin fixes 2017-06-24 23:53:50 -04:00
Josh de Leeuw
7f36522dee change default button label 2017-06-21 23:47:52 -04:00
Josh de Leeuw
817ad388ac clear display before adding content 2017-06-21 23:47:39 -04:00
Josh de Leeuw
560332185e fix button spacing 2017-06-21 23:47:28 -04:00
Josh de Leeuw
12e045b151 fix backwards plugin 2017-06-21 15:43:31 -04:00