Commit Graph

1919 Commits

Author SHA1 Message Date
Becky Gilbert
a095e81fad fix prompt bug 2020-09-16 18:15:32 -07:00
Becky Gilbert
657418ba20
Merge pull request #736 from kupiqu/save_stimulus_start_slider
systematically saving stimulus and slider start position in all slider plugins
2020-09-16 17:25:23 -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
Becky Gilbert
5efd4cba32 Merge remote-tracking branch 'upstream/master'
syncing with main jspsych repo
2020-08-20 17:01:57 -07:00
Becky Gilbert
83d43d0f02 Merge branch 'master' of https://github.com/becky-gilbert/jsPsych
Pull PRs from GitHub.
2020-08-20 16:50:09 -07:00
Becky Gilbert
c9ab05fac9
Merge pull request #3 from becky-gilbert/revert-2-master
Revert "adding new plugins"
2020-08-20 16:27:06 -07:00
Becky Gilbert
7dc91152f1
Merge pull request #995 from becky-gilbert/revert-2-master
Revert 2 master
2020-08-20 16:13:33 -07:00
Becky Gilbert
6e845754a1
Revert "adding new plugins" 2020-08-20 16:10:31 -07:00
Becky Gilbert
3277f8f433
Merge pull request #2 from hesmall/master
Add html-audio-response and audio-audio-response plugins.
2020-08-20 16:08:12 -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
hesmall
5717805c20 adding new plugins 2020-08-16 11:16:58 -04:00
Josh de Leeuw
2cbd571a18
Delete .travis.yml 2020-08-14 22:37:57 -04:00
Josh de Leeuw
5d25665f75
fix actions file 2020-08-14 22:36:37 -04:00
Josh de Leeuw
ee60d13492
fix string error 2020-08-14 22:35:17 -04:00
Josh de Leeuw
1cbcde844f
use node 14.x for tests 2020-08-14 22:34:08 -04:00
Josh de Leeuw
c82664dc48
Add GitHub Action for Jest Testing 2020-08-14 22:32:25 -04: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
Ari Dyckovsky
1640c5341f
Update package.json to reflect organization
The name of the remote repository was attached to the previous username. This change updates the package.json references to the remote Git URLs with the organization `jspsych`.
2020-08-13 10:21:45 -06:00
kachergis
5f2a534748 fixed example trial type in video-button-response plugin 2020-07-10 20:18:15 -07: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
9c4e26173e Removed closing </link> tag 2020-05-26 20:20:03 -05:00
Vijay Marupudi
afbcaa4f3d slider_start and video duplicate id fixes. 2020-05-22 22:30:27 -05:00
Josh de Leeuw
83980085ef
Update README.md 2020-05-21 11:35:25 -04:00
Vijay Marupudi
752d34e08f Updated to reflect that video preload is supported 2020-05-19 07:33:10 -05:00
Vijay Marupudi
0c33c8277e
Updated to reflect that video preload is supported 2020-05-19 07:28:39 -05:00
Daiichiro Kuroki
a08d320b3c Enable to response by clicking string directly. 2020-05-12 13:25:51 +09:00
kachergis
2358c10e7a corrected trial type 2020-04-20 13:34:41 -07:00
Vijay Marupudi
4057fc8d88 Fixed undefined type check with typo 2020-04-09 12:05:39 -05:00
akochari
f9fd3fde45
Update jspsych-same-different-html.md
updated the trial type name to the correct one
2020-02-26 20:55:17 +01: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
alisdt
619117391c
Input to submitToTurk must be non-empty 2020-02-05 10:56:31 +00:00
Josh de Leeuw
9de501e9da
Merge pull request #667 from hrcn/patch-1
Variable name error?
2020-01-29 16:06:01 -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
d3094bb088
Merge pull request #658 from becky-gilbert/master
Added Code of Conduct
2019-10-17 10:15:10 -04:00
Becky Gilbert
9a75d5f5f1 revert changes to video plugins 2019-10-17 15:00:15 +01:00
Becky Gilbert
854f91a378 added BG to contributors 2019-10-17 10:09:16 +01:00
Becky Gilbert
5a95b8dee4 modified CoC text 2019-10-17 10:08:05 +01:00
Becky Gilbert
8b18d2c43d fixed formatting issue 2019-08-30 14:56:03 +01:00
Becky Gilbert
ce12eb8858 fixed bug in video-* plugin data 2019-08-30 14:40:25 +01:00
Becky Gilbert
7f40db7de7 added CoC 2019-08-30 14:33:06 +01:00
Josh de Leeuw
542a6b1734
Merge pull request #643 from cthorey/fix-rdk-fixation-cross-color
[FIX] fixation_cross_color in the rdk plugin
2019-07-22 17:13:37 -04:00
clement thorey
173aa28d64 [FIX] typo 2019-07-22 20:16:41 +01:00
Josh de Leeuw
ef5b1f53ff minor docs updates 2019-07-16 11:39:39 -04:00
Josh de Leeuw
c5bc9023e3 video tests, step package version 2019-07-16 11:00:04 -04:00