Becky Gilbert
a4bdfc8e5f
change key_press to response and key_press_stim1 to response_stim1 in same-different-image plugin #638
2021-02-17 15:03:29 -08:00
Becky Gilbert
6254aa1aaf
change key_press to response and key_press_stim1 to response_stim1 in same-different-html plugin #638
2021-02-17 15:00:49 -08:00
Becky Gilbert
477182d482
remove quotes from data object keys
2021-02-17 14:45:50 -08:00
Becky Gilbert
17d66404d5
remove quotes from data object keys
2021-02-17 14:44:24 -08:00
Becky Gilbert
a8a1ffac2f
change key_press to response in rdk plugin #638
2021-02-17 14:42:55 -08:00
Josh de Leeuw
bc33117135
refactor
2021-02-17 17:35:23 -05:00
Becky Gilbert
efdd0eace3
change left/right data properties to a response object with left/right keys in maxdiff plugin #638
2021-02-17 14:21:09 -08:00
Becky Gilbert
da5407a3f8
remove quotes from data object keys
2021-02-17 14:10:49 -08:00
Becky Gilbert
7c551ec96a
change key_press to response in image-keyboard-response plugin #638
2021-02-17 14:09:51 -08:00
Becky Gilbert
9c65ff19b7
change button_pressed to response in image-button-response plugin #638
2021-02-17 14:06:37 -08:00
Becky Gilbert
79edaad804
change key_press to response in iat-image plugin #638
2021-02-17 14:03:01 -08:00
Becky Gilbert
c81d28ae7d
change key_press to response in iat-html plugin #638
2021-02-17 14:00:40 -08:00
Becky Gilbert
f0c91fbd32
remove quotes from data object keys
2021-02-17 13:56:43 -08:00
Becky Gilbert
3580b29767
change key_press to response in html-keyboard-response plugin #638
2021-02-17 13:55:55 -08:00
Becky Gilbert
fe5f14dae4
change button_pressed to response in html-button-response plugin #638
2021-02-17 13:52:21 -08:00
Becky Gilbert
b85ced4f0a
change answers to response in cloze plugin #638
2021-02-17 13:45:33 -08:00
Becky Gilbert
c812e8dbc3
change key_press to response in categorize-image plugin #638
2021-02-17 13:40:55 -08:00
Becky Gilbert
7475bf85a5
change key_press to response in categorize-html plugin #638
2021-02-17 13:38:29 -08:00
Becky Gilbert
f348944054
change key_press to response in categorize-animation plugin #638
2021-02-17 13:34:53 -08:00
Becky Gilbert
64e71b5d28
remove quotes from data object keys
2021-02-17 13:27:23 -08:00
Becky Gilbert
c9cbe39448
change key_press to response in canvas-keyboard-response plugin #638
2021-02-17 13:26:54 -08:00
Becky Gilbert
118aeffd3c
change button_pressed to response in canvas-button-response plugin #638
2021-02-17 13:23:14 -08:00
Becky Gilbert
e0f6f5d0dc
remove quotes from object keys in trial data
2021-02-17 10:49:13 -08:00
Becky Gilbert
abf3e19a29
change key_press to response in audio-keyboard-response plugin #638
2021-02-17 10:34:24 -08:00
Becky Gilbert
b82eb9a503
change button_pressed to response in audio-button-response plugin #638
2021-02-16 19:49:28 -08:00
Becky Gilbert
64a66b812d
change responses to response in animation plugin #638
2021-02-16 19:46:19 -08:00
Becky Gilbert
538b9cb3b6
remove comment re JSON encoding in data
2021-02-16 18:59:03 -08:00
Becky Gilbert
2312550127
Merge branch 'master' into feature-objects-arrays-in-data
2021-02-16 14:37:07 -08:00
Josh de Leeuw
e5a8a77ef3
Merge branch 'master' into feature-plugin-extensions
2021-02-15 21:44:45 -05:00
GEJ1
a9bbc9664a
I remove: all the jQuery code, the mouse_adjustment option because use the jQuery slider.
2021-02-15 15:47:25 -03:00
GEJ1
99925639e0
Comments with jqueryToVanilla lines of code, but without change it
2021-02-14 15:53:20 -03:00
Josh de Leeuw
8efc628891
Merge pull request #1354 from klanderson/patch-1
...
Check fullscreen is active before exiting fullscreen
2021-02-13 21:39:45 -05:00
Becky Gilbert
94d72ddf82
merge changes from master and fix merge conflicts #670
2021-02-12 15:58:48 -08:00
Becky Gilbert
c8298e226f
merge master into preload plugin branch and fix merge conflict
2021-02-09 10:57:46 -08:00
Josh de Leeuw
bb0b84d86a
add samples_per_sec to validation plugin
2021-02-08 23:00:19 -05:00
Josh de Leeuw
b10c69eb21
Merge branch 'master' into feature-key-code-update
2021-02-08 22:00:09 -05:00
Josh de Leeuw
e4b601f39b
adjust default instructions
2021-02-05 13:31:16 -05:00
Josh de Leeuw
0e709cf8e0
remove console.log
2021-02-05 10:55:36 -05:00
Josh de Leeuw
bb26dc461c
don't call preload methods if no files to load
2021-02-05 10:36:11 -05:00
Josh de Leeuw
d8ee2d2b02
update example for webgazer, fix bug in validate
2021-02-04 17:41:45 -05:00
Josh de Leeuw
00cca0e52b
move instructions out of validation plugin
2021-02-04 17:34:38 -05:00
Josh de Leeuw
00d650a7de
moving some functionality to init-camera plugin, adding docs
2021-02-04 17:19:34 -05:00
Josh de Leeuw
9e0cc86796
add plugin docs for webgazer
2021-02-04 16:36:44 -05:00
Becky Gilbert
bc585ee64a
fix minor errors in plugin/parameter descriptions
2021-02-02 15:02:26 -08:00
Becky Gilbert
41bc9d725e
switch to only using strings for keyboard keys, change keyboard key parameter types/defaults, remove compareKeys fn #396
2021-02-02 15:01:38 -08:00
Becky Gilbert
9ea3c6517a
change KEYCODE parameter type to KEY #396
2021-02-02 12:30:15 -08:00
GEJ1
637f654961
Documentation completed. Also I added description in some parameters.
2021-02-02 11:26:39 -03:00
Becky Gilbert
fd097e996d
switch from keyCodes to key strings, fix param description errors and typos
2021-02-01 17:48:52 -08:00
Peter J. Kohler
b038c66370
forgot to add try ... catch back into the code
2021-01-31 18:03:18 -05:00
Peter J. Kohler
2c5a45e90d
fixed mouse-based scaling
2021-01-31 18:01:44 -05:00
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
