Rebase to upstream

.github/workflows/jest.yml

@@ -0,0 +1,20 @@
+# This workflow will do a clean install of node dependencies, build the source code and run tests across different versions of node
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+
+name: Jest Test
+
+on: [ push, pull_request ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js
+      uses: actions/setup-node@v1
+      with:
+        node-version: '14.x'
+    - run: npm ci
+    - run: npm test

README.md

@@ -1,26 +1,41 @@
 ![logo](http://www.jspsych.org/img/jspsych-logo.jpg)
 
-jsPsych is a JavaScript library for creating behavioral experiments that run in a web browser. jsPsych provides a framework for defining experiments using a set of flexible plugins that create different kinds of tasks a subject could complete during an experiment. By assembling these different plugins together it is possible to create many different types of experiments.
+jsPsych is a JavaScript library for creating behavioral experiments that run in a web browser. It provides a framework for defining experiments using a set of flexible plugins that create different kinds of events, and collect different kinds of data. By assembling these plugins together, it is possible to create a wide range of online experiments.
+
+jsPsych experiments are created using the languages of the Web: HTML, CSS, and JavaScript. JavaScript is the programming language used by web browsers. It provides the most control and flexibility for creating web-based experiments, and allows for easy integration with other JavaScript libraries and server-side tools. Don't have JavaScript experience? Don't worry! jsPsych was designed to make creating online experiments as easy as possible for people without web development experience.
+
+## What can I do with jsPsych?
+
+jsPsych comes with a number of plugins that you can use create tasks and collect data. Some plugins do general things, like present a stimulus (text, image, audio, video) and record a key press or button response along with a response time. Other plugins do more specific things, like show a set of instructions pages, run a drag-and-drop image sorting task, present a Random-Dot Kinematogram, or calibrate the WebGazer eye-tracking extension. See the documentation website for a [list of all plugins](https://www.jspsych.org/plugins/list-of-plugins/), and to see what each plugin can do.
+
+Often people can create their experiment by combining these plugins together. But if that's not possible for your experiment, you can also modify a plugin file or [create your own plugin](https://www.jspsych.org/overview/plugins/#creating-a-new-plugin). This gives you the flexibility to do exactly what you want, while still taking advantage of jsPsych's general experiment-building framework.
+
+Getting started
+---------------
+
+New to jsPsych? A good place to start is the basic [Hello World tutorial](https://www.jspsych.org/tutorials/hello-world/) on the jsPsych website. The [Reaction Time Task tutorial](https://www.jspsych.org/tutorials/rt-task/) is a great next step, since it covers many core topics and features. 
+
+There are also a number of [video tutorials](https://www.jspsych.org/tutorials/video-tutorials), including [Session 1 of the Moving Online Workshop](https://www.youtube.com/watch?v=BuhfsIFRFe8), which provides an overview of jsPsych suitable for brand new users. 
 
 Examples
 ----------
 
-Several example experiments and plugin demonstrations are available in the `/examples` folder.
+Several example experiments and plugin demonstrations are available in the `/examples` folder. After you've downloaded the [latest release](https://github.com/jspsych/jsPsych/releases), double-click on an example HTML file to run it in your web browser, and open it with a programming-friendly text editor to see how it works.
 
 Documentation
 -------------
 
-Documentation is available at [docs.jspsych.org](http://docs.jspsych.org).
+Documentation is available at [jspsych.org](https://www.jspsych.org/).
 
 Need help?
 ----------
 
-For questions about using the library, please use the [Discussions forum](https://github.com/jspsych/jsPsych/discussions).
+For questions about using the library, please use the GitHub [Discussions forum](https://github.com/jspsych/jsPsych/discussions).
 
 Contributing
 ------------
 
-Contributions to the code are welcome. Please use the [Issue tracker system](https://github.com/jodeleeuw/jsPsych/issues) to report bugs or discuss suggestions for new features and improvements. If you would like to contribute code, [submit a Pull request](https://help.github.com/articles/using-pull-requests).
+Contributions to the code are welcome. Please use the [Issue tracker system](https://github.com/jspsych/jsPsych/issues) to report bugs or discuss suggestions for new features and improvements. If you would like to contribute code, [submit a Pull request](https://help.github.com/articles/using-pull-requests). See the [Contributing to jsPsych](https://www.jspsych.org/about/contributing/) documentation page for more information.
 
 Citation
 --------
@@ -45,4 +60,4 @@ Credits
 
 jsPsych was created by Josh de Leeuw ([@jodeleeuw](https://github.com/jodeleeuw)).
 
-There have been many [contributors](https://github.com/jodeleeuw/jsPsych/blob/master/contributors.md) to the library. Thank you!
+We're grateful for the many [contributors](https://github.com/jspsych/jsPsych/blob/master/contributors.md) to the library, and for the generous support from a [Mozilla Open Source Support (MOSS)](https://www.mozilla.org/en-US/moss/) award. Thank you!

contributors.md

@@ -1,19 +1,62 @@
 The following people have contributed to the development of jsPsych by writing code, documentation, and/or suggesting improvements (in alphabetical order):
+* alisdt - https://github.com/alisdt
+* Antonia - https://github.com/Ahoidal
+* aucuparia - https://github.com/aucuparia
 * Xiaolu Bai - https://github.com/lbai001
+* bjoluc - https://github.com/bjoluc
+* Christian Brickhouse - https://github.com/chrisbrickhouse
+* Teon L Brooks - https://github.com/teonbrooks
+* Eamon Caddigan - https://github.com/eamoncaddigan
 * Jason Carpenter
 * Steve Chao - https://github.com/stchao
-* Krisitn Diep - https://github.com/kristiyip
+* Zhanwen "Phil" Chen - https://github.com/zhanwenchen
+* cthorey - https://github.com/cthorey
+* Guy Davidson - https://github.com/guydav
+* Kristin Diep - https://github.com/kristiyip
+* Ari Dyckovsky - https://github.com/aridyckovsky
+* Etienne Gaudrain - https://github.com/egaudrain
+* Jon Gauthier - https://github.com/hans
+* Robert Gibboni - https://github.com/r-b-g-b
 * Becky Gilbert - https://github.com/becky-gilbert
+* Mark Gorenstein - https://github.com/mgorenstein
+* Rui Han - https://github.com/hrcn
+* Andy Heusser - https://github.com/andrewheusser
+* Angus Hughes - https://github.com/awhug
+* Gustavo Juantorena - https://github.com/GEJ1
+* Chris Jungerius - https://github.com/cjungerius
+* George Kachergis - https://github.com/kachergis
+* Yul Kang - https://github.com/yulkang
+* Spencer King - https://github.com/spencerking
 * Jana Klaus - https://github.com/janakl4us
+* Arnold Kochari - https://github.com/akochari
+* Peter Jes Kohler - https://github.com/pjkohler 
+* kupiqu - https://github.com/kupiqu
+* Daiichiro Kuroki - https://github.com/kurokida
 * Jonas Lambers
+* madebyafox - https://github.com/madebyafox
 * Shane Martin - https://github.com/shamrt
+* Vijay Marupudi - https://github.com/vijaymarupudi
 * Adrian Oesch - https://github.com/adrianoesch
+* Benjamin Ooghe-Tabanou - https://github.com/boogheta
+* Nikolay B Petrov - https://github.com/nikbpetrov
+* Dillon Plunkett - https://github.com/dillonplunkett
 * Junyan Qi - https://github.com/GavinQ1
 * Sivananda Rajananda - https://github.com/vrsivananda
 * Dan Rivas - https://github.com/rivasd
+* Werner Sævland - https://github.com/wernersa
 * Marian Sauter - https://github.com/mariansauter
+* Ellen Shapiro - https://github.com/designatednerd
+* Jan Simson - https://github.com/jansim
+* Hannah Small - https://github.com/hesmall
+* sprengholz - https://github.com/sprengholz
+* Dominik Strohmeier - https://github.com/onkeltom
+* Nabeel Sulieman - https://github.com/nabsul
+* Hitoshi Tominaga - https://github.com/tbrotherm
 * Tim Vergenz - https://github.com/vergenzt
 * Matteo Visconti di Oleggio Castello - https://github.com/mvdoc
+* Ilya Vorontsov - https://github.com/VorontsovIE
 * Wolfgang Walther - https://github.com/wolfgangwalther
 * Erik Weitnauer - https://github.com/eweitnauer
 * Rob Wilkinson - https://github.com/RobAWilkinson
+* Andy Woods - https://github.com/andytwoods
+* Reto Wyss - https://github.com/retowyss

css/jspsych.css

@@ -76,9 +76,17 @@
   border-color: #ccc;
 }
 
-.jspsych-btn:hover {
+/* only apply the hover style on devices with a mouse/pointer that can hover - issue #977 */
+@media (hover: hover) {
+  .jspsych-btn:hover {
+    background-color: #ddd;
+    border-color: #aaa;
+  }
+}
+
+.jspsych-btn:active {
   background-color: #ddd;
-  border-color: #aaa;
+  border-color:#000000;
 }
 
 .jspsych-btn:disabled {
@@ -88,6 +96,79 @@
   cursor: not-allowed;
 }
 
+/* custom style for input[type="range] (slider) to improve alignment between positions and labels */
+
+.jspsych-slider {
+  appearance: none;
+  -webkit-appearance: none; 
+  -moz-appearance: none;
+  width: 100%; 
+  background: transparent; 
+}
+.jspsych-slider:focus {
+  outline: none;
+}
+/* track */
+.jspsych-slider::-webkit-slider-runnable-track {
+  appearance: none;
+  -webkit-appearance: none;
+  width: 100%;
+  height: 8px;
+  cursor: pointer;
+  background: #eee;
+  box-shadow: 0px 0px 0px #000000, 0px 0px 0px #0d0d0d;
+  border-radius: 2px;
+  border: 1px solid #aaa;
+}
+.jspsych-slider::-moz-range-track {
+  appearance: none;
+  width: 100%;
+  height: 8px;
+  cursor: pointer;
+  background: #eee;
+  box-shadow: 0px 0px 0px #000000, 0px 0px 0px #0d0d0d;
+  border-radius: 2px;
+  border: 1px solid #aaa;
+}
+.jspsych-slider::-ms-track {
+  appearance: none;
+  width: 99%;
+  height: 14px;
+  cursor: pointer;
+  background: #eee;
+  box-shadow: 0px 0px 0px #000000, 0px 0px 0px #0d0d0d;
+  border-radius: 2px;
+  border: 1px solid #aaa;
+}
+/* thumb */
+.jspsych-slider::-webkit-slider-thumb {
+  border: 1px solid #666;
+  height: 24px;
+  width: 15px;
+  border-radius: 5px;
+  background: #ffffff;
+  cursor: pointer;
+  -webkit-appearance: none;
+  margin-top: -9px;
+}
+.jspsych-slider::-moz-range-thumb {
+  border: 1px solid #666;
+  height: 24px;
+  width: 15px;
+  border-radius: 5px;
+  background: #ffffff;
+  cursor: pointer;
+}
+.jspsych-slider::-ms-thumb {
+  border: 1px solid #666;
+  height: 20px;
+  width: 15px;
+  border-radius: 5px;
+  background: #ffffff;
+  cursor: pointer;
+  margin-top: -2px;
+}
+
 /* jsPsych progress bar */
 
 #jspsych-progressbar-container {

docs/about/contributing.md

@@ -6,37 +6,37 @@ Contributions to jsPsych are welcome! All of the code is managed through the Git
 
 #### Discuss the proposed change
 
-If you have a specific modification in mind, open a [new issue via GitHub](https://github.com/jspsych/jsPsych/issues/new). Describe the proposed change and what problem it solves. If you are interested in adding a new plugin to the library, it helps if you post an example of the plugin in use and describe the different use cases of the plugin.
+If you have a specific modification in mind -- for instance, a new feature or bug fix -- please open a [new issue via GitHub](https://github.com/jspsych/jsPsych/issues/new). Describe the proposed change and what functionality it adds to the library and/or what problem it solves. If you are interested in adding a new plugin to the library, it helps if you post an example of the plugin in use and describe the different use cases of the plugin (for more guidance, see the "Writing new plugins" section below).
 
-If the modification you are interested in working on is not quite at the point where you have a specific modification to the code base in mind, then it might be helpful to discuss the issue first on the [jsPsych Google group](https://groups.google.com/forum/#!forum/jspsych).
+If you are thinking about proposing a change but not at the point where you have a specific modification to the code base in mind, then it might be helpful to discuss the issue first on [GitHub Discussions](https://github.com/jspsych/jsPsych/discussions). Discussion posts can be useful for sharing code and getting feedback before requesting a change to the library.
 
 #### Fork the library and modify the code
 
-To make changes to the code, you should fork the jsPsych library via GitHub. Changes should be targeted at the `master` branch.
+To make changes to the code, you should fork the jsPsych library via GitHub and make modifications on your fork. You may find it useful to make modifications on branches, so that you can keep your proposed changes separate from any other unrelated changes you might want to make on your fork.
 
 #### Submit a pull request
 
-Once your modification is complete, submit a pull request to merge your changes into the main repository. Pull requests will be reviewed by the project owner.
+Once your modification is complete, submit a pull request to merge your changes into the `master` branch of the main repository. Pull requests will be reviewed by the project team.
 
 ## Writing new plugins
 
-New plugins are welcome additions to the library. Plugins can be distributed independently of the main library or added to the GitHub repository via a pull request and the process described above. If you want to add your plugin to the main library then there are a few guidelines to follow.
+New plugins are welcome additions to the library. Plugins can be distributed independently of the main library or added to the GitHub repository via a pull request, following the process described above. If you want to add your plugin to the main library then there are a few guidelines to follow.
 
 #### Make the plugin as general as possible
 
 Plugins are most useful when they are flexible. Avoid fixing the value of parameters that could be variables. This is especially important for any text that displays on the screen in order to facilitate use in multiple languages.
 
 #### Use the jsPsych.pluginAPI module when appropriate
 
-The pluginAPI module contains functions relevant to plugin development. Avoid duplicating the functions defined within the library in your plugin. If you have a suggestion for improving pluginAPI methods, then go ahead and submit a pull request to modify it directly.
+The [pluginAPI module](../core_library/jspsych-pluginAPI.md) contains functions relevant to plugin development. Avoid duplicating the functions defined within the library in your plugin, and instead use the pluginAPI whenever possible. If you have a suggestion for improving pluginAPI methods, then go ahead and submit a pull request to modify it directly.
 
 #### Document your plugin
 
 When submitting a pull request to add your plugin, make sure to include a documentation page in the same style as the other docs pages. Documentation files exist in the `docs` directory.
 
 #### Include an example file
 
-Write a short example file to include in the `examples` directory. This should demonstrate the basic use cases of the plugin as clearly as possible.
+Write a short example HTML file to include in the `examples` directory. This should demonstrate the basic use cases of the plugin as clearly as possible.
 
 #### Include a testing file
 

docs/about/support.md

@@ -1,7 +1,7 @@
 # Support
 
-For questions about jsPsych the preferred method of support is the [jsPsych Google group](https://groups.google.com/forum/#!forum/jspsych). Questions are most likely to be answered when they include a reproducible example of the problem. If you can make your code available online and link to the experiment, that will make the question easier to answer.
+For questions about jsPsych the preferred method of support is via [GitHub Discussions](https://github.com/jspsych/jsPsych/discussions). Questions are most likely to be answered when they include a reproducible example of the problem. If you can make your code available online and link to the experiment, that will make the question easier to answer.
 
-If you have identified a problem with jsPsych, such as a bug in the code or an error in the documentation, please [open a new issue](https://github.com/jodeleeuw/jsPsych/issues) on the GitHub site.
+If you have identified a problem with jsPsych, such as a bug in the code or an error in the documentation, please [open a new issue](https://github.com/jspsych/jsPsych/issues/new) on the GitHub site. And if you have a suggestion for fixing the problem, feel free to propose a modification by following the steps in the [Contribuitng to jsPsych](contributing.md) page.
 
 Inquiries for paid consultation to develop experiments using jsPsych or to create new custom jsPsych features can be sent to [josh.deleeuw@gmail.com](mailto:josh.deleeuw@gmail.com).