Skip to content

Commit

Permalink
Merge branch 'main' into core-rewrite
Browse files Browse the repository at this point in the history
  • Loading branch information
bjoluc committed Jul 13, 2023
2 parents 0b55a32 + a7e6f8c commit 9cac68a
Show file tree
Hide file tree
Showing 195 changed files with 1,604 additions and 666 deletions.
47 changes: 47 additions & 0 deletions CITATION.cff
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
cff-version: "1.2.0"
authors:
- family-names: Leeuw
given-names: Joshua R.
name-particle: de
orcid: "https://orcid.org/0000-0003-4815-2364"
- family-names: Gilbert
given-names: Rebecca A.
orcid: "https://orcid.org/0000-0003-4574-7792"
- family-names: Luchterhandt
given-names: Björn
orcid: "https://orcid.org/0000-0002-9225-2787"
contact:
- family-names: Leeuw
given-names: Joshua R.
name-particle: de
orcid: "https://orcid.org/0000-0003-4815-2364"
doi: 10.5281/zenodo.7702307
message: If you use this software, please cite our article in the
Journal of Open Source Software.
preferred-citation:
authors:
- family-names: Leeuw
given-names: Joshua R.
name-particle: de
orcid: "https://orcid.org/0000-0003-4815-2364"
- family-names: Gilbert
given-names: Rebecca A.
orcid: "https://orcid.org/0000-0003-4574-7792"
- family-names: Luchterhandt
given-names: Björn
orcid: "https://orcid.org/0000-0002-9225-2787"
date-published: 2023-05-11
doi: 10.21105/joss.05351
issn: 2475-9066
issue: 85
journal: Journal of Open Source Software
publisher:
name: Open Journals
start: 5351
title: "jsPsych: Enabling an Open-Source Collaborative Ecosystem of
Behavioral Experiments"
type: article
url: "https://joss.theoj.org/papers/10.21105/joss.05351"
volume: 8
title: "jsPsych: Enabling an Open-Source Collaborative Ecosystem of
Behavioral Experiments"
12 changes: 9 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,15 @@ See the [contributing to jsPsych](https://www.jspsych.org/latest/developers/cont

## Citation

If you use this library in academic work, please cite the [paper that describes jsPsych](http://link.springer.com/article/10.3758%2Fs13428-014-0458-y):
If you use this library in academic work, the preferred citation is:

de Leeuw, J.R. (2015). jsPsych: A JavaScript library for creating behavioral experiments in a Web browser. *Behavior Research Methods*, _47_(1), 1-12. doi:10.3758/s13428-014-0458-y
de Leeuw, J.R., Gilbert, R.A., & Luchterhandt, B. (2023). jsPsych: Enabling an open-source collaborative ecosystem of behavioral experiments. *Journal of Open Source Software*, *8*(85), 5351, [https://joss.theoj.org/papers/10.21105/joss.05351](https://joss.theoj.org/papers/10.21105/joss.05351).

This paper is an updated description of jsPsych and includes all current core team members. It replaces the earlier paper that described jsPsych:

de Leeuw, J.R. (2015). jsPsych: A JavaScript library for creating behavioral experiments in a Web browser. *Behavior Research Methods*, _47_(1), 1-12. doi:[10.3758/s13428-014-0458-y](http://link.springer.com/article/10.3758%2Fs13428-014-0458-y)

Citations help us demonstrate that this library is used and valued, which allows us to continue working on it.

## Contributors

Expand All @@ -59,4 +65,4 @@ The project is currently managed by the core team of Josh de Leeuw ([@jodeleeuw]

jsPsych was created by [Josh de Leeuw](http://www.twitter.com/joshdeleeuw).

We're also grateful for the generous support from a [Mozilla Open Source Support award](https://www.mozilla.org/en-US/moss/), which funded development of the library from 2020-2021.
We're also grateful for the generous support from a [Mozilla Open Source Support award](https://www.mozilla.org/en-US/moss/), which funded development of the library from 2020-2022.
10 changes: 8 additions & 2 deletions docs/about/about.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ jsPsych was created by [Josh de Leeuw :fontawesome-brands-twitter:](http://www.t

### Citation

If you use jsPsych please cite the following paper.
If you use this library in academic work, the preferred citation is:

de Leeuw, J. R. (2015). jsPsych: A JavaScript library for creating behavioral experiments in a web browser. _Behavior Research Methods_, _47_(1), 1-12. [doi:10.3758/s13428-014-0458-y](https://doi.org/10.3758/s13428-014-0458-y).
de Leeuw, J.R., Gilbert, R.A., & Luchterhandt, B. (2023). jsPsych: Enabling an open-source collaborative ecosystem of behavioral experiments. *Journal of Open Source Software*, *8*(85), 5351, [https://joss.theoj.org/papers/10.21105/joss.05351](https://joss.theoj.org/papers/10.21105/joss.05351).

This paper is an updated description of jsPsych and includes all current core team members. It replaces the earlier paper that described jsPsych:

de Leeuw, J.R. (2015). jsPsych: A JavaScript library for creating behavioral experiments in a Web browser. *Behavior Research Methods*, _47_(1), 1-12. doi:[10.3758/s13428-014-0458-y](http://link.springer.com/article/10.3758%2Fs13428-014-0458-y)

Citations help us demonstrate that this library is used and valued, which allows us to continue working on it.
4 changes: 2 additions & 2 deletions docs/demos/eye-tracking-with-webgazer.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<script src="https://unpkg.com/[email protected].1"></script>
<script src="https://unpkg.com/[email protected].3"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
Expand All @@ -13,7 +13,7 @@
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<link
rel="stylesheet"
href="https://unpkg.com/[email protected].1/css/jspsych.css"
href="https://unpkg.com/[email protected].3/css/jspsych.css"
/>
<link rel="stylesheet" href="docs-demo.css" type="text/css">
</head>
Expand Down
4 changes: 2 additions & 2 deletions docs/demos/jspsych-animation-demo.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<html>
<head>
<script src="docs-demo-timeline.js"></script>
<script src="https://unpkg.com/[email protected].1"></script>
<script src="https://unpkg.com/[email protected].3"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<link rel="stylesheet" href="https://unpkg.com/[email protected].1/css/jspsych.css" />
<link rel="stylesheet" href="https://unpkg.com/[email protected].3/css/jspsych.css" />
<style>
#jspsych-animation-image {
height: 80% !important;
Expand Down
4 changes: 2 additions & 2 deletions docs/demos/jspsych-audio-button-response-demo-1.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<html>
<head>
<script src="docs-demo-timeline.js"></script>
<script src="https://unpkg.com/[email protected].1"></script>
<script src="https://unpkg.com/[email protected].3"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<link rel="stylesheet" href="https://unpkg.com/[email protected].1/css/jspsych.css" />
<link rel="stylesheet" href="https://unpkg.com/[email protected].3/css/jspsych.css" />
</head>
<body></body>
<script>
Expand Down
4 changes: 2 additions & 2 deletions docs/demos/jspsych-audio-button-response-demo-2.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<html>
<head>
<script src="docs-demo-timeline.js"></script>
<script src="https://unpkg.com/[email protected].1"></script>
<script src="https://unpkg.com/[email protected].3"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<link rel="stylesheet" href="https://unpkg.com/[email protected].1/css/jspsych.css" />
<link rel="stylesheet" href="https://unpkg.com/[email protected].3/css/jspsych.css" />
</head>
<body></body>
<script>
Expand Down
4 changes: 2 additions & 2 deletions docs/demos/jspsych-audio-keyboard-response-demo-1.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<html>
<head>
<script src="docs-demo-timeline.js"></script>
<script src="https://unpkg.com/[email protected].1"></script>
<script src="https://unpkg.com/[email protected].3"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<link rel="stylesheet" href="https://unpkg.com/[email protected].1/css/jspsych.css" />
<link rel="stylesheet" href="https://unpkg.com/[email protected].3/css/jspsych.css" />
</head>
<body></body>
<script>
Expand Down
4 changes: 2 additions & 2 deletions docs/demos/jspsych-audio-keyboard-response-demo-2.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<html>
<head>
<script src="docs-demo-timeline.js"></script>
<script src="https://unpkg.com/[email protected].1"></script>
<script src="https://unpkg.com/[email protected].3"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<link rel="stylesheet" href="https://unpkg.com/[email protected].1/css/jspsych.css" />
<link rel="stylesheet" href="https://unpkg.com/[email protected].3/css/jspsych.css" />
</head>
<body></body>
<script>
Expand Down
4 changes: 2 additions & 2 deletions docs/demos/jspsych-audio-slider-response-demo-1.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<html>
<head>
<script src="docs-demo-timeline.js"></script>
<script src="https://unpkg.com/[email protected].1"></script>
<script src="https://unpkg.com/[email protected].3"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<link rel="stylesheet" href="https://unpkg.com/[email protected].1/css/jspsych.css" />
<link rel="stylesheet" href="https://unpkg.com/[email protected].3/css/jspsych.css" />
</head>
<body></body>
<script>
Expand Down
4 changes: 2 additions & 2 deletions docs/demos/jspsych-audio-slider-response-demo-2.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<html>
<head>
<script src="docs-demo-timeline.js"></script>
<script src="https://unpkg.com/[email protected].1"></script>
<script src="https://unpkg.com/[email protected].3"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<link rel="stylesheet" href="https://unpkg.com/[email protected].1/css/jspsych.css" />
<link rel="stylesheet" href="https://unpkg.com/[email protected].3/css/jspsych.css" />
</head>
<body></body>
<script>
Expand Down
4 changes: 2 additions & 2 deletions docs/demos/jspsych-browser-check-demo1.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<html>
<head>
<script src="docs-demo-timeline.js"></script>
<script src="https://unpkg.com/[email protected].1"></script>
<script src="https://unpkg.com/[email protected].3"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<link rel="stylesheet" href="https://unpkg.com/[email protected].1/css/jspsych.css" />
<link rel="stylesheet" href="https://unpkg.com/[email protected].3/css/jspsych.css" />
</head>
<body></body>
<script>
Expand Down
4 changes: 2 additions & 2 deletions docs/demos/jspsych-browser-check-demo2.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<html>
<head>
<script src="docs-demo-timeline.js"></script>
<script src="https://unpkg.com/[email protected].1"></script>
<script src="https://unpkg.com/[email protected].3"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<link rel="stylesheet" href="https://unpkg.com/[email protected].1/css/jspsych.css" />
<link rel="stylesheet" href="https://unpkg.com/[email protected].3/css/jspsych.css" />
</head>
<body></body>
<script>
Expand Down
4 changes: 2 additions & 2 deletions docs/demos/jspsych-browser-check-demo3.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<html>
<head>
<script src="docs-demo-timeline.js"></script>
<script src="https://unpkg.com/[email protected].1"></script>
<script src="https://unpkg.com/[email protected].3"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<link rel="stylesheet" href="https://unpkg.com/[email protected].1/css/jspsych.css" />
<link rel="stylesheet" href="https://unpkg.com/[email protected].3/css/jspsych.css" />
</head>
<body></body>
<script>
Expand Down
4 changes: 2 additions & 2 deletions docs/demos/jspsych-browser-check-demo4.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<html>
<head>
<script src="docs-demo-timeline.js"></script>
<script src="https://unpkg.com/[email protected].1"></script>
<script src="https://unpkg.com/[email protected].3"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<link rel="stylesheet" href="https://unpkg.com/[email protected].1/css/jspsych.css" />
<link rel="stylesheet" href="https://unpkg.com/[email protected].3/css/jspsych.css" />
</head>
<body></body>
<script>
Expand Down
4 changes: 2 additions & 2 deletions docs/demos/jspsych-call-function-demo1.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<html>
<head>
<script src="docs-demo-timeline.js"></script>
<script src="https://unpkg.com/[email protected].1"></script>
<script src="https://unpkg.com/[email protected].3"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<link rel="stylesheet" href="https://unpkg.com/[email protected].1/css/jspsych.css" />
<link rel="stylesheet" href="https://unpkg.com/[email protected].3/css/jspsych.css" />
<link rel="stylesheet" href="docs-demo.css" type="text/css" />
</head>
<body></body>
Expand Down
4 changes: 2 additions & 2 deletions docs/demos/jspsych-call-function-demo2.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<html>
<head>
<script src="docs-demo-timeline.js"></script>
<script src="https://unpkg.com/[email protected].1"></script>
<script src="https://unpkg.com/[email protected].3"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<link rel="stylesheet" href="https://unpkg.com/[email protected].1/css/jspsych.css" />
<link rel="stylesheet" href="https://unpkg.com/[email protected].3/css/jspsych.css" />
<link rel="stylesheet" href="docs-demo.css" type="text/css" />
</head>
<body></body>
Expand Down
4 changes: 2 additions & 2 deletions docs/demos/jspsych-call-function-demo3.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<html>
<head>
<script src="docs-demo-timeline.js"></script>
<script src="https://unpkg.com/[email protected].1"></script>
<script src="https://unpkg.com/[email protected].3"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<link rel="stylesheet" href="https://unpkg.com/[email protected].1/css/jspsych.css" />
<link rel="stylesheet" href="https://unpkg.com/[email protected].3/css/jspsych.css" />
<link rel="stylesheet" href="docs-demo.css" type="text/css" />
</head>
<body></body>
Expand Down
4 changes: 2 additions & 2 deletions docs/demos/jspsych-canvas-button-response-demo1.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<html>
<head>
<script src="docs-demo-timeline.js"></script>
<script src="https://unpkg.com/[email protected].1"></script>
<script src="https://unpkg.com/[email protected].3"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<link rel="stylesheet" href="https://unpkg.com/[email protected].1/css/jspsych.css" />
<link rel="stylesheet" href="https://unpkg.com/[email protected].3/css/jspsych.css" />
<link rel="stylesheet" href="docs-demo.css" type="text/css" />
</head>
<body></body>
Expand Down
4 changes: 2 additions & 2 deletions docs/demos/jspsych-canvas-button-response-demo2.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<html>
<head>
<script src="docs-demo-timeline.js"></script>
<script src="https://unpkg.com/[email protected].1"></script>
<script src="https://unpkg.com/[email protected].3"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<link rel="stylesheet" href="https://unpkg.com/[email protected].1/css/jspsych.css" />
<link rel="stylesheet" href="https://unpkg.com/[email protected].3/css/jspsych.css" />
<link rel="stylesheet" href="docs-demo.css" type="text/css" />
</head>
<body></body>
Expand Down
4 changes: 2 additions & 2 deletions docs/demos/jspsych-canvas-button-response-demo3.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<html>
<head>
<script src="docs-demo-timeline.js"></script>
<script src="https://unpkg.com/[email protected].1"></script>
<script src="https://unpkg.com/[email protected].3"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<link rel="stylesheet" href="https://unpkg.com/[email protected].1/css/jspsych.css" />
<link rel="stylesheet" href="https://unpkg.com/[email protected].3/css/jspsych.css" />
<link rel="stylesheet" href="docs-demo.css" type="text/css" />
</head>
<body></body>
Expand Down
4 changes: 2 additions & 2 deletions docs/demos/jspsych-canvas-keyboard-response-demo1.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<html>
<head>
<script src="docs-demo-timeline.js"></script>
<script src="https://unpkg.com/[email protected].1"></script>
<script src="https://unpkg.com/[email protected].3"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<link rel="stylesheet" href="https://unpkg.com/[email protected].1/css/jspsych.css" />
<link rel="stylesheet" href="https://unpkg.com/[email protected].3/css/jspsych.css" />
<link rel="stylesheet" href="docs-demo.css" type="text/css" />
</head>
<body></body>
Expand Down
4 changes: 2 additions & 2 deletions docs/demos/jspsych-canvas-keyboard-response-demo2.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<html>
<head>
<script src="docs-demo-timeline.js"></script>
<script src="https://unpkg.com/[email protected].1"></script>
<script src="https://unpkg.com/[email protected].3"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<link rel="stylesheet" href="https://unpkg.com/[email protected].1/css/jspsych.css" />
<link rel="stylesheet" href="https://unpkg.com/[email protected].3/css/jspsych.css" />
<link rel="stylesheet" href="docs-demo.css" type="text/css" />
</head>
<body></body>
Expand Down
4 changes: 2 additions & 2 deletions docs/demos/jspsych-canvas-slider-response-demo1.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<html>
<head>
<script src="docs-demo-timeline.js"></script>
<script src="https://unpkg.com/[email protected].1"></script>
<script src="https://unpkg.com/[email protected].3"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<link rel="stylesheet" href="https://unpkg.com/[email protected].1/css/jspsych.css" />
<link rel="stylesheet" href="https://unpkg.com/[email protected].3/css/jspsych.css" />
<link rel="stylesheet" href="docs-demo.css" type="text/css" />
</head>
<body></body>
Expand Down
4 changes: 2 additions & 2 deletions docs/demos/jspsych-canvas-slider-response-demo2.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
<html>
<head>
<script src="docs-demo-timeline.js"></script>
<script src="https://unpkg.com/[email protected].1"></script>
<script src="https://unpkg.com/[email protected].3"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<link rel="stylesheet" href="https://unpkg.com/[email protected].1/css/jspsych.css" />
<link rel="stylesheet" href="https://unpkg.com/[email protected].3/css/jspsych.css" />
<link rel="stylesheet" href="docs-demo.css" type="text/css" />
</head>
<body></body>
Expand Down
4 changes: 2 additions & 2 deletions docs/demos/jspsych-categorize-animation-demo1.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
<html>
<head>
<script src="docs-demo-timeline.js"></script>
<script src="https://unpkg.com/[email protected].1"></script>
<script src="https://unpkg.com/[email protected].3"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<script src="https://unpkg.com/@jspsych/[email protected]"></script>
<link rel="stylesheet" href="https://unpkg.com/[email protected].1/css/jspsych.css" />
<link rel="stylesheet" href="https://unpkg.com/[email protected].3/css/jspsych.css" />
<style>
#jspsych-categorize-animation-stimulus {
height: 80% !important;
Expand Down
Loading

0 comments on commit 9cac68a

Please sign in to comment.