GEJ1
35881c1e9a
little change in prompts in order to have language consistency
2021-01-30 13:04:22 -03:00
Becky Gilbert
56abce0a2f
revert webgazer commits #396
2021-01-29 17:42:16 -08:00
Peter J. Kohler
24f185d3b0
button prompts added
2021-01-29 17:30:54 -05:00
Peter J. Kohler
000d64b9f6
removed unnecessary functions
2021-01-28 21:35:27 -05:00
Peter J. Kohler
9f7df71ae1
deleted one of the no longer useful functions
2021-01-28 21:27:31 -05:00
Peter J. Kohler
e4d7a7c46c
removing commented out older code
2021-01-28 20:25:21 -05:00
Peter J. Kohler
1555a9e718
blindspot measurement optional
2021-01-28 20:23:16 -05:00
Becky Gilbert
87cde65fce
add cancelPreloads calls, fix logic, load all media types regardless of loading failures #1351
2021-01-28 16:10:39 -08:00
GEJ1
1f813bc9f3
documentation update and resize decision (true or false)
2021-01-28 14:56:15 -03:00
Peter J. Kohler
e1d42e6a0f
resizing built-in
2021-01-27 19:41:41 -05:00
Becky Gilbert
8279cba460
switch to file load/error callbacks, improve logic, add detailed errors, add success/error callback params, add param descriptions #1351
2021-01-27 16:33:39 -08:00
Peter J. Kohler
a4d97ceb28
function renamed
2021-01-27 18:35:14 -05:00
Peter J. Kohler
99bbe3c0d1
modifications to virtual chinrest
2021-01-26 10:20:52 -05:00
Josh de Leeuw
cedd031af1
add timing params
2021-01-22 10:31:37 -05:00
Josh de Leeuw
ad051b0e36
add new calibration pattern
2021-01-22 10:12:02 -05:00
Josh de Leeuw
9225d27f0d
improving validation plugin options
2021-01-21 18:19:28 -05:00
Josh de Leeuw
bce3b5576e
have extension initialize return Promise
2021-01-21 16:42:11 -05:00
Becky Gilbert
661df3e078
add success and timeout flags to data, record failed files, clear display, separate functions for timeout and success #1351
2021-01-19 16:57:34 -08:00
Josh de Leeuw
6afe9ce086
fixes #1380
2021-01-19 16:51:43 -05:00
Josh de Leeuw
399cccdd27
add center-offset-pixels mode
2021-01-19 16:04:54 -05:00
Josh de Leeuw
74fae253cc
update locations in docs where keyCode is used
2021-01-15 21:53:38 -05:00
Josh de Leeuw
6a2dc21bc8
replaces keyCode with .key, gets all tests working
2021-01-15 17:55:12 -05:00
Josh de Leeuw
b78efaac73
adding a validation accuracy metric
2021-01-14 15:33:41 -05:00
Josh de Leeuw
0aac702f1c
implements #670 , needs further checking
2021-01-14 10:28:18 -05:00
Josh de Leeuw
42f54f0fb3
tweaking calibration and validation scripts
2021-01-13 09:47:11 -05:00
Josh de Leeuw
6006293416
fixes circle drawing problem
2021-01-13 09:23:05 -05:00
Josh de Leeuw
b146037af3
calibration + validation sort of working...
2021-01-12 17:52:41 -05:00
Josh de Leeuw
cf9fd335bb
working on plugin modes
2021-01-12 09:27:04 -05:00
Becky Gilbert
4610a7ac83
add img onload fn to draw image when loaded - fixes #1305
2021-01-09 11:18:57 -08:00
Josh de Leeuw
57c04dac10
improvements to calibration using MutationObserver
2021-01-08 14:22:21 -05:00
Josh de Leeuw
d5d462d4c8
switch auto_preload to bool, add trials parameter, implement working tests
2021-01-07 22:15:38 -05:00
Josh de Leeuw
e892d58e2e
remove preloading from jsPsych.init
2021-01-07 15:54:05 -05:00
klanderson
aa87725d43
Check fullscreen is active before exiting fullscreen
...
I was getting a "Document not active" error and this fixes it. The change checks that the document is in fullscreen mode and only calls the exit functions if it is in fullscreen.
I am exiting my experiment through a callback, using the 'call-function' plugin. That trial is pushed to the timeline following the fullscreen off trial. I would have figured that would be okay but it kept throwing the error at the end of the experiment.
2021-01-07 12:02:59 -08:00
Josh de Leeuw
ba1e7a72c9
core of preload plugin
2021-01-07 10:05:47 -05:00
Josh de Leeuw
d4830275d5
working on shifting preload stuff
2021-01-07 09:19:16 -05:00
Josh de Leeuw
3a08b15fc9
start implementing plugin, didn't get far yet
2021-01-06 18:54:28 -05:00
Josh de Leeuw
fdb0209bb0
working on webgazer stuff
2021-01-06 18:41:37 -05:00
Josh de Leeuw
562e993f9c
adding a calibration routine, but it's not great
2021-01-02 17:20:21 -05:00
Becky Gilbert
42962039af
JSON stringify the stimulus array in the trial data
2020-12-08 15:31:44 -08:00
Becky Gilbert
c70c36cbbe
add missing var to startTime definition
2020-12-07 16:22:23 -08:00
Becky Gilbert
074aca788c
fix start_time/startTime typo, use WebAudio clock for RT
2020-12-07 16:19:34 -08:00
Becky Gilbert
df8c28f397
Merge pull request #1171 from mgorenstein/fix-video-plugin-preload
...
Fix stimulus parameter naming in video response plugins
2020-12-01 16:48:37 -08:00
Mark Gorenstein
d63012706f
video files stored in 'stimulus' var for consistency with other plugins
2020-11-25 14:47:32 -08: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
6471e4bb4f
make button style consistent with other plugins, add space between button and sort area
2020-11-25 09:46:26 -08:00
Becky Gilbert
8c81c9f420
Merge branch 'master' into slider-positions
2020-11-25 09:26:00 -08:00
Daiichiro Kuroki
1fff4606ba
for using with a touch device.
2020-11-24 21:31:18 +09:00
Becky Gilbert
6673c9e903
add IDs to label/alternative text
2020-11-20 15:52:47 -08:00
Becky Gilbert
1aaee22324
Merge pull request #1136 from awhug/master
...
Add maxdiff plugin
2020-11-20 15:09:39 -08:00
Angus Hughes
bcb3b3653c
Fix error when required is false to return null response
2020-11-20 11:19:53 +08:00
Becky Gilbert
dc00efd0ea
add counter text and stim_starts_inside params, fix missed hardcoded colors
2020-11-19 18:24:44 -08:00
Becky Gilbert
4c0dab0122
add new border/background color parameters
2020-11-19 16:07:35 -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
3424f386ff
fix slider label positioning with custom track/thumb CSS & calc - fixes #695
2020-11-14 16:57:01 -08:00
Becky Gilbert
b2c845fa19
remove div container for prompt
2020-11-11 11:05:40 -08:00
Becky Gilbert
5f18091058
remove div containers for prompts
2020-11-11 10:53:03 -08:00
Becky Gilbert
8104d356c5
minor changes for clarity and consistency with other v6.2 plugins
2020-11-10 14:01:21 -08:00
Becky Gilbert
ece6e3b57e
Merge pull request #700 from cjungerius/feature/canvas
...
Add canvas keyboard/button/slider plugins
2020-11-09 15:38:50 -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
Mark Gorenstein
9af708d584
replace 'stimulus' with 'sources' in trial_data of video plugins
2020-11-05 11:54:26 -08:00
Mark Gorenstein
ec83e9cd20
replace 'stimulus' with 'sources' in registerPreload calls of video plugins
2020-11-05 10:01:11 -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
b02e73ea21
warn about .mov files - #649
2020-10-26 16:58:45 -07:00
Becky Gilbert
8b5a68edfc
fix undefined starttime problem
2020-10-26 15:43:02 -07:00
Becky Gilbert
6396036c9e
add response_allowed_while_playing parameter - #1137
2020-10-26 14:47:30 -07:00
Angus Hughes
857db43166
maxdiff response column labels now more generic
2020-10-23 11:05:13 +08:00
Angus Hughes
b0646f5649
simple randomisation test added, better comments
2020-10-22 11:23:07 +08:00
Becky Gilbert
719b009707
change require_movement so that clicking cursor is sufficient - fixes #696
2020-10-21 17:37:37 -07:00
awhug
1467f3b1e4
Initial pass of maxdiff plugin
2020-10-21 16:08:11 +08:00
Becky Gilbert
294aac623f
change button_pressed data from string to int
2020-10-20 17:49:58 -07:00
Becky Gilbert
6efc5f26d5
change default stim duration params to null - fixes #755
2020-10-20 16:53:29 -07:00
Becky Gilbert
83a289b6c9
changed wording in console.warn
2020-10-19 17:31:33 -07:00
Becky Gilbert
dadf120f17
Merge pull request #1028 from chrisbrickhouse/1014
...
Warn about possible deadlock if response_ends_trial is false and trial_duration is null
2020-10-19 16:52:48 -07:00
Becky Gilbert
d010376bb6
fix canvas positioning to get rid of scroll bars - #881
2020-10-11 14:55:04 -07:00
Becky Gilbert
121428cf31
change start param to slider_start
2020-10-11 12:16:39 -07:00
Becky Gilbert
d236f028f0
changed slider response from string to numeric
2020-10-11 10:55:10 -07:00
Becky Gilbert
b3effcb015
fix inconsistencies in parameter info
2020-10-11 10:33:01 -07:00
Becky Gilbert
f92b9214b5
fixed inconsistencies in parameter info
2020-10-11 10:26:10 -07:00
Becky Gilbert
7e95a9b005
Merge pull request #676 from dillonplunkett/checkboxes-fix
...
return input elements to within label elements
2020-10-08 18:22:24 -07:00
Becky Gilbert
864093238b
Merge pull request #675 from hrcn/patch-2
...
initialize variable i in for loops
2020-10-08 18:04:32 -07:00
Becky Gilbert
55d0f31548
Merge pull request #701 from kurokida/master
...
Enable a survey-likert response selection by clicking label string
2020-10-08 16:47:57 -07:00
Becky Gilbert
787b7bd0a5
Merge pull request #714 from vijaymarupudi/video-slider-fixes
...
fix start and slider_start parameters in video-slider-response plugin
2020-10-08 16:30:43 -07:00
Becky Gilbert
a891526e89
edit formatting
2020-10-02 11:39:44 -07:00
Becky Gilbert
402d4f0d8f
Merge pull request #1072 from chrisbrickhouse/Iss-1062
...
survey-html-form: add autofocus parameter
2020-10-02 11:35:37 -07:00
Becky Gilbert
f99048a0e2
change autofocus to autocomplete
2020-10-02 11:02:51 -07:00
Becky Gilbert
b96a875d30
Merge pull request #1073 from chrisbrickhouse/Iss-1064
...
survey-*: default to autocomplete=off and add param to enable
2020-10-02 11:00:23 -07:00
Christian
ebb6fce877
survey-html-form: validate autofocus parameter
...
When the autofocus parameter is set, check that
the specified element exists in the DOM and
check that the specified ID is unique. If there
is not exactly 1 element with the given ID, warn
the user about unexpected behavior.
2020-10-01 19:45:49 -07:00
Christian
11291625ff
survey-*: stop autocomplete add param to enable
...
Add an autocomplete parameter to the html form plugin
series. When autocomplete is set to true, the <form>
tag added by the survey-* plugin will behave as before.
When not defined or set to false, the <form> tag is
given the autocomplete="off" attribute and value.
2020-10-01 19:09:49 -07:00
Becky Gilbert
bc2809b3f1
remove files that were unintentionally added in PR
2020-10-01 16:58:06 -07:00
Becky Gilbert
36df451b08
Merge pull request #1081 from GEJ1/instructions
...
Instructions plugin changes: add page_label parameter to plugin and docs, add show_page_number parameter to docs
2020-10-01 16:52:28 -07:00
Gustavo Juantorena
293338172f
Addded page_label to plugin jspsych-instructions also changed docs
2020-09-27 14:07:14 -03:00
Gustavo Juantorena
49f68b7b7e
Revert "Addded page_labe to plugin.info also changed docs"
...
This reverts commit ada7afbf89
2020-09-27 03:44:35 -03:00
Gustavo Juantorena
ada7afbf89
Addded page_labe to plugin.info also changed docs
2020-09-27 03:05:35 -03:00
Gustavo Juantorena
e1ec9852c8
Fixed problem going to next trial
2020-09-25 19:11:29 -03:00
Christian
47e6080d63
survey-*: stop autocomplete add param to enable
...
Excludes survey-multi-select since it's highly
specialized and the parameter doesn't really
apply to it.
Issue #1064
2020-09-23 21:47:15 -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
Becky Gilbert
a095e81fad
fix prompt bug
2020-09-16 18:15:32 -07:00
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
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
