Commit Graph

388 Commits

Author SHA1 Message Date
Josh de Leeuw
b10c69eb21
Merge branch 'master' into feature-key-code-update 2021-02-08 22:00:09 -05:00
Becky Gilbert
67a262eb55 change key response to lowercase when case_sensitive is false 2021-02-08 17:03:53 -08:00
Becky Gilbert
711504887f add case_sensitive_responses option to jsPsych.init, add tests and example #396 2021-02-04 17:31:51 -08:00
Josh de Leeuw
21e7fa34c1 add version info to jspsych.js #1472 2021-02-04 13:49:44 -05:00
Becky Gilbert
bce6c030a7 minor edit to console.warn messages 2021-02-03 09:52:24 -08:00
Becky Gilbert
72af0b870f add console.warn to pluginAPI keyCode functions 2021-02-02 16:10:45 -08:00
Becky Gilbert
9ea3c6517a change KEYCODE parameter type to KEY #396 2021-02-02 12:30:15 -08:00
Becky Gilbert
56abce0a2f revert webgazer commits #396 2021-01-29 17:42:16 -08:00
Becky Gilbert
188cb14e3d
Merge branch 'master' into feature-css-class-trial 2021-01-18 12:18:43 -08:00
Josh de Leeuw
6a2dc21bc8 replaces keyCode with .key, gets all tests working 2021-01-15 17:55:12 -05:00
Josh de Leeuw
9d92c58c13 fix broken tests, variable reference error 2021-01-08 14:47:51 -05:00
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
f39f394866 adds test and handles non-array #832 2020-12-29 22:06:28 -05:00
Josh de Leeuw
76c5d02597 add additional testing for #832, fixes function declaration 2020-12-26 17:24:33 -05:00
Josh de Leeuw
f6ac098b4c first draft of #832 2020-12-23 09:56:40 -05:00
Josh de Leeuw
b6a28b0433 adds first pass at #883 2020-12-16 15:15:41 -05:00
Becky Gilbert
0e2745c79d improve preloading test based on console.warn 2020-12-07 16:57:01 -08:00
Becky Gilbert
82c0eeafb3 fix typo in localSave link 2020-12-07 13:46:14 -08:00
Becky Gilbert
918df9475f add link to safe mode console.warn message 2020-12-03 16:40:49 -08:00
Becky Gilbert
a433d81c90 merge in the video parameter name changes from master 2020-12-03 15:43:15 -08:00
Becky Gilbert
de9149c158
Merge pull request #1261 from jspsych/video-plugin-testing
video-* plugins: stim parameter name change and tests
2020-12-03 14:21:18 -08:00
Becky Gilbert
7cd7fc65f4 remove HTML5 stalled event listener & check for progress bar before updating - fixes #1262 2020-12-03 11:01:19 -08:00
Becky Gilbert
91f774a50a add protocol check and file_protocol flag to disable Web Audio and video preloading (CORS errors) 2020-12-02 17:44:34 -08:00
Becky Gilbert
ffc80a372e add console warning when auto preload parameter not found 2020-12-02 12:11:03 -08:00
Josh de Leeuw
a2b0cecfbb fixes Preloading progress bar not centered when experiment_width property is set in jsPsych.init #1160 2020-10-30 12:01:41 -04:00
bjoluc
2f421f4317 delay init() execution until the document is ready
This prevents jsPsych from creating a duplicate `body` element when the
actual `body` element has not yet been initialized.

Fixes  #316
2020-10-28 12:34:22 +01:00
Josh de Leeuw
b216b8f1e1 fixes test suite failure (== vs. === issues!) 2020-10-23 11:15:03 -04:00
Josh de Leeuw
eb08de2a43
Merge branch 'min-rt' into min_RT 2020-10-23 10:06:35 -04:00
Josh de Leeuw
56a74ac745
Merge pull request #990 from egaudrain/master
Patching for issue #989
2020-10-22 11:32:30 -04:00
Josh de Leeuw
fae00cb196 implement #664 and add test 2020-10-21 18:30:51 -04:00
Josh de Leeuw
e952dc7558 Merge branch 'master' of https://github.com/jspsych/jsPsych 2020-10-21 17:42:07 -04:00
Josh de Leeuw
de175d5d52 add error message when timeline is empty throw a useful error message when the timeline is empty #853 2020-10-21 17:41:53 -04:00
Becky Gilbert
fc4ce1267a
Merge branch 'master' into audio-bug 2020-10-20 15:46:52 -07:00
Becky Gilbert
a513a922b1 fix incorrect HTML5 event names, remove loading event listeners after they fire 2020-10-20 15:37:42 -07:00
Becky Gilbert
b58cac1032 Revert "fix incorrect HTML5 audio event names, remove all event listeners after" 2020-10-20 15:32:37 -07:00
Becky Gilbert
d88a6a3e7d fix incorrect HTML5 audio event names, remove all event listeners after
they fire
2020-10-20 15:20:56 -07:00
Josh de Leeuw
099d2e10eb
Merge pull request #976 from aridyckovsky/issue-751
Graceful failure on DataCollection.first and .last
2020-10-20 15:31:38 -04:00
Becky Gilbert
1621169f82 use audio instead of this to remove event listener 2020-10-12 12:10:03 -07:00
Becky Gilbert
7410fd01f0 fixes html5 audio progress bar error - #648 2020-10-11 17:15:13 -07:00
Etienne Gaudrain
934f183b96
Patching for issue #989
Fixing inappropriate looping technique that throws error when attributing default parameters.
2020-08-19 18:52:15 +02:00
Ari Dyckovsky
183c6a6d65 Patch to graceful failure on DataCollection.first and .last
Reason:
- Expected behavior by experimenter to avoid crashing by throw exception

Changes made:
- Tightened up logic statements and returned array directly without
  shallow copy first

Notes:
- Issue #751 and #748
2020-08-14 13:47:27 -06:00
Ari Dyckovsky
9da4bb23d0 Graceful failure on DataCollection.first and .last
Reason:
- When n > number of trials, or nonpositive, failure caused crashing

Changes made:
- Update each .first and .last methods to return when n is within range,
  while throwing an error when it is not.
- Use Array.prototype.slice to create subarrays

Notes:
- Issue #751 and #748
- Unsure of precise goal for graceful failure. Should it throw an error
  create a dummy array of some length?
2020-08-13 23:22:35 -06:00
Vijay Marupudi
4057fc8d88 Fixed undefined type check with typo 2020-04-09 12:05:39 -05:00
Rui Han
a5650993ed
Variable name error? 2020-01-29 16:02:24 -05:00
Josh de Leeuw
87571e9cc9 fixes #659 2019-10-17 15:46:26 -04:00
Josh de Leeuw
b4ca37be1c implement experiment_width #572 2019-07-11 10:21:50 -04:00
Josh de Leeuw
d120b3b470 implement alternating groups sample method (#528) 2019-07-08 21:53:40 -04:00
Josh de Leeuw
5172e6dddc add shuffleAlternateGroups #528 2019-07-08 11:35:25 -04:00