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
Christian
e9735c6137
Fix test failures. 2020-09-03 18:28:07 -07:00
Christian
36f637ed6e
Warn about possible deadlock per #1014 
If no duration is set and a response does not end the trial, then
the trial will never end and the experiment is deadlocked. Users
will be warned about this situation and given hints on how to
fix it.
 2020-09-03 18:13:35 -07:00
Gustavo Juantorena
c515d43c0d virtual chin plugin 2020-08-31 17:54:23 -03:00
Gustavo Juantorena
47726004cb jsPsych-virtual-chin-rest.js new plugin 2020-08-31 17:36:08 -03:00
Peter J. Kohler
92b6c2e78e updates to free-sort plugin, new functionality 2020-08-29 14:55:25 -04:00
Salva Ardid
8729972db6 systematically saving stimulus and slider start position in all slider plugins 2020-06-02 21:43:04 -04:00
Vijay Marupudi
afbcaa4f3d slider_start and video duplicate id fixes. 2020-05-22 22:30:27 -05:00
Daiichiro Kuroki
a08d320b3c Enable to response by clicking string directly. 2020-05-12 13:25:51 +09:00
Chris Jungerius
7aa6736c96
final cleanup of canvas-keyboard-response 2020-05-11 18:57:51 +02:00
Chris Jungerius
a996795831 created temp html file to test the three new plugin types, and fixed some bugs that emerged from first tests 2020-05-11 14:41:19 +02:00
Chris Jungerius
3c284f35d5 added canvas-button-response 2020-05-11 13:56:20 +02:00
Chris Jungerius
04d71b715d added canvas-slider-response; changed canvas ID to a more fitting name 2020-05-11 13:45:51 +02:00
Chris Jungerius
d1437ea9dd cleaned up canvas-keyboard-response and added option to resize canvas 2020-05-11 13:21:25 +02:00
Chris Jungerius
45f6840b6b added original version of canvas keyboard response plugin 2020-05-11 11:34:39 +02:00
Dillon Plunkett
be6c945419 return checkboxes to within label elements 
Checkbox elements were previously child elements of their labels.
55106fe increased backwards compatibility, but seems to have
inadvertently made them siblings instead, breaking some css.
Fix that.
 2020-02-25 16:54:28 -05:00
Rui Han
eddfac4746
initialize variable i in for loops 2020-02-24 14:51:44 -05:00
clement thorey
173aa28d64 [FIX] typo 2019-07-22 20:16:41 +01: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
7e33af85cb add video-* plugins #636 2019-07-12 11:38:21 -04:00
Josh de Leeuw
6be86017c8
Merge pull request #622 from designatednerd/master 
Add video trial requiring a keyboard response
 2019-07-11 10:40:38 -04:00
Josh de Leeuw
c126b58f0a implement scale_width #633 2019-07-11 10:29:47 -04:00
Josh de Leeuw
9a682bb260 fix semicolon bug 2019-07-05 11:20:59 -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
0fe7fe2cf4 fix div bug 2019-07-04 15:14:58 -04:00
Josh de Leeuw
9bed32fb0f implements settable width for sliders (#631) 2019-07-04 15:10:52 -04:00
Josh de Leeuw
dda27c6bc8 implement require_movement in slider plugins #573 2019-07-03 12:26:20 -04:00
Josh de Leeuw
381d2778b1 Merge branch 'pr/575' 2019-07-02 22:15:50 -04:00
Josh de Leeuw
4ea7cef4cd prettier margin on slider 2019-07-02 22:00:00 -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
119b4701b7 fix required parameter #629 2019-07-02 16:40:13 -04:00
Josh de Leeuw
637d87ecf6 fix placeholder implementation #627 2019-07-02 11:09:57 -04:00
Josh de Leeuw
cd82ddfc1d implements #627 2019-07-02 11:06:41 -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
Ellen Shapiro
c37b9f77cf
Add video trial requiring a keyboard response 2019-06-20 21:52:51 +02:00
Josh de Leeuw
25357c33a0 adding random question order option to multi-choice #305 2019-06-19 22:14:32 -04:00
Josh de Leeuw
fd3c15c8ce implementing random order for survey-likert (#305) 2019-06-19 17:03:27 -04:00
Josh de Leeuw
a056d40b2f fixes #580 2019-06-18 12:16:28 -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
e0fc3497ca avoid implicit event parameter 2019-05-24 13:55:23 -04:00
Nabeel Sulieman
6fd5cc2f76 Add missing preventDefault() call to survey-text plugin submit 2019-05-07 20:43:35 -07:00
Jan Simson
40d50e89a2 html-form-plugin: Return JS Object instead of JSON String 2019-04-04 10:43:57 -04:00
Jan Simson
e2aac619a7 Use proper type for html parameter in survey-html-form plugin 2019-03-20 17:49:48 -04:00
Jan Simson
1b36f56daa Added jspsych-survey-html-form plugin 2019-03-14 16:17:51 -04:00
Robert Gibboni
f935aa8172 Variable not defined, potential bug. Use 2019-01-31 16:56:56 -08:00
Robert Gibboni
560a655c64 option to set video playback rate 2019-01-23 15:23:25 -08:00
Josh de Leeuw
5741bd83e9 fix survey-text bug (#576) 2018-12-14 11:26:43 -05:00
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