Skip to content

Commit

Permalink
Merge branch 'main' into update-config-dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@bjoluc
bjoluc committed Sep 11, 2024
2 parents ffef261 + 6e345b8 commit 9e823bf
Show file tree
Hide file tree
Showing 125 changed files with 359 additions and 304 deletions.
5 changes: 5 additions & 0 deletions .changeset/young-wolves-grow.md
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"jspsych": patch
---

Improve type definitions for randomization module
3 changes: 2 additions & 1 deletion contributors.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ The following people have contributed to the development of jsPsych by writing c
* kupiqu - https://github.com/kupiqu
* Daiichiro Kuroki - https://github.com/kurokida
* Jonas Lambers
* Max Lovell - https://github.com/max-lovell
* madebyafox - https://github.com/madebyafox
* Shane Martin - https://github.com/shamrt
* Vijay Marupudi - https://github.com/vijaymarupudi
Expand Down Expand Up @@ -63,4 +64,4 @@ The following people have contributed to the development of jsPsych by writing c
* Reto Wyss - https://github.com/retowyss
* Shaobin Jiang - https://github.com/Shaobin-Jiang
* Haotian Tu - https://github.com/thtTNT

* Joshua Unrau - https://github.com/joshunrau
4 changes: 2 additions & 2 deletions docs/demos/eye-tracking-with-webgazer.html
View file
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].2"></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].2/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
View file
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].2"></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].2/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
View file
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].2"></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].2/css/jspsych.css" />
</head>
<body></body>
<script>
Expand Down
4 changes: 2 additions & 2 deletions docs/demos/jspsych-audio-button-response-demo-2.html
View file
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].2"></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].2/css/jspsych.css" />
</head>
<body></body>
<script>
Expand Down
4 changes: 2 additions & 2 deletions docs/demos/jspsych-audio-button-response-demo-3.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
<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].2"></script>
<!--<script src="https://unpkg.com/@jspsych/[email protected]"></script>-->
<script src="../../packages/plugin-audio-button-response/dist/index.browser.js"></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].2/css/jspsych.css" />-->
<link rel="stylesheet" href="../../packages/jspsych/css/jspsych.css" />
</head>
<body></body>
Expand Down
4 changes: 2 additions & 2 deletions docs/demos/jspsych-audio-keyboard-response-demo-1.html
View file
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].2"></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].2/css/jspsych.css" />
</head>
<body></body>
<script>
Expand Down
4 changes: 2 additions & 2 deletions docs/demos/jspsych-audio-keyboard-response-demo-2.html
View file
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].2"></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].2/css/jspsych.css" />
</head>
<body></body>
<script>
Expand Down
4 changes: 2 additions & 2 deletions docs/demos/jspsych-audio-slider-response-demo-1.html
View file
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].2"></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].2/css/jspsych.css" />
</head>
<body></body>
<script>
Expand Down
4 changes: 2 additions & 2 deletions docs/demos/jspsych-audio-slider-response-demo-2.html
View file
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].2"></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].2/css/jspsych.css" />
</head>
<body></body>
<script>
Expand Down
4 changes: 2 additions & 2 deletions docs/demos/jspsych-browser-check-demo1.html
View file
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].2"></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].2/css/jspsych.css" />
</head>
<body></body>
<script>
Expand Down
4 changes: 2 additions & 2 deletions docs/demos/jspsych-browser-check-demo2.html
View file
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].2"></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].2/css/jspsych.css" />
</head>
<body></body>
<script>
Expand Down
4 changes: 2 additions & 2 deletions docs/demos/jspsych-browser-check-demo3.html
View file
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].2"></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].2/css/jspsych.css" />
</head>
<body></body>
<script>
Expand Down
4 changes: 2 additions & 2 deletions docs/demos/jspsych-browser-check-demo4.html
View file
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].2"></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].2/css/jspsych.css" />
</head>
<body></body>
<script>
Expand Down
4 changes: 2 additions & 2 deletions docs/demos/jspsych-call-function-demo1.html
View file
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].2"></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].2/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
View file
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].2"></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].2/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
View file
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].2"></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].2/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
View file
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].2"></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].2/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
View file
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].2"></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].2/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
View file
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].2"></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].2/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
View file
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].2"></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].2/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
View file
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].2"></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].2/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
View file
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].2"></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].2/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
View file
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].2"></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].2/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
View file
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].2"></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].2/css/jspsych.css" />
<style>
#jspsych-categorize-animation-stimulus {
height: 80% !important;
Expand Down
4 changes: 2 additions & 2 deletions docs/demos/jspsych-categorize-animation-demo2.html
View file
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].2"></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].2/css/jspsych.css" />
<style>
#jspsych-categorize-animation-stimulus {
height: 80% !important;
Expand Down
4 changes: 2 additions & 2 deletions docs/demos/jspsych-categorize-html-demo1.html
View file
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].2"></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].2/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-image-demo1.html
View file
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].2"></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].2/css/jspsych.css" />
<link rel="stylesheet" href="docs-demo.css" type="text/css">
</head>
<body></body>
Expand Down
Loading

0 comments on commit 9e823bf

Please sign in to comment.