Merge branch 'master' into feature-key-code-update

docs/tutorials/hello-world.md

@@ -10,11 +10,28 @@ Start by downloading the jsPsych library. The most recent version can always be
 
 ![releasespage](/img/githubreleases.jpg)
 
+!!! warning
+		We strongly recommend downloading the latest release of the code rather than downloading the zip file of the code via the *Big Green Button* on the GitHub site. Downloading the code via the *Big Green Button* may give you a copy of the library that is in development and contains bugs.
+
 ## Step 2: Create a folder to store your experiment files
 
-Create a folder on your computer to put the experiment files in. Once you've created the folder, open the downloaded archive from step 1, and move the extracted folder (called `jspsych-6.3.0` if using v6.3.0 of jsPsych) into the experiment folder. Here's what it looks like on a Windows machine:
+Create a folder on your computer to put the experiment files in. Once you've created the folder, open the downloaded archive from step 1, and move the extracted folder (called `jspsych-6.3.0` if using v6.3.0 of jsPsych) into the experiment folder.
 
-![folder setup](/img/folder-setup.png)
+```
+📂 My Experiment
+--  📂 jspsych-6.3.0
+```
+
+If you open up the `jspsych-6.3.0` folder you should see this structure.
+
+```
+📂 My Experiment
+--  📂 jspsych-6.3.0
+----  📂 css
+----  📂 examples
+----  📂 plugins
+----  📄 jspsych.js
+```
 
 ## Step 3: Create a new HTML file
 
@@ -22,7 +39,11 @@ To edit jsPsych code you'll need a programming-friendly text editor. A great fre
 
 Once you've got a text editor that you like, create a new file in the experiment folder called `experiment.html`
 
-![folder setup](/img/folder-with-html.png)
+```
+📂 My Experiment
+--  📂 jspsych-6.3.0
+--  📄 experiment.html
+```
 
 ## Step 4: Add the bare-minimum HTML code
 

docs/tutorials/rt-task.md

@@ -61,6 +61,7 @@ jsPsych.init({
   timeline: timeline
 });
 ```
+After each step in the tutorial you can view the complete code up to that point by clicking on the expandable box below.
 
 ??? example "The complete code so far"
     ``` html

examples/add-to-end-of-timeline.html

@@ -13,14 +13,13 @@
     type: 'html-keyboard-response',
     stimulus: 'first trial; new trial added when on_finish is called',
     on_finish: function(){
-      jsPsych.pauseExperiment();
       jsPsych.addNodeToEndOfTimeline({
         timeline: [{
           type: 'image-keyboard-response',
           stimulus: 'img/happy_face_4.jpg',
           stimulus_width: 300
         }]
-      }, jsPsych.resumeExperiment)
+      })
     }
   }
 

mkdocs.yml

@@ -13,7 +13,7 @@ extra:
       link: 'https://github.com/jspsych'
     - icon: 'fontawesome/brands/twitter'
       link: 'https://twitter.com/joshdeleeuw'
-copyright: 'Copyright © 2012-2020 Josh de Leeuw'
+copyright: 'Copyright © 2012-2021 Josh de Leeuw'
 google_analytics:
   - 'UA-50563838-1'
   - 'auto'