Deployed da654079 to 7.0 with MkDocs 1.2.2 and mike 1.0.1

7.0/demos/jspsych-instructions-demo-2.html

@@ -17,7 +17,7 @@
 
   var preload_trial = {
     type: jsPsychPreload,
-    auto_preload: true
+    images: ['img/con2.png']
   }
 
   var start = {

7.0/demos/jspsych-reconstruction-demo1.html

@@ -42,7 +42,7 @@
   }
 
   var match_item = {
-    type: jsPsychHtmKeyboardResponse,
+    type: jsPsychHtmlKeyboardResponse,
     stimulus: '<div style="display: block; margin: auto; height: 300px; width: 300px; position: relative;">'+
       '<div style="display: block; position: absolute; top: '+(150 - 210/2)+'px; left:'+(150 - 210/2)+'px; background-color: #000000; '+
       'width: 210px; height: 210px;"></div></div>',

7.0/demos/jspsych-survey-likert-demo2.html

@@ -45,7 +45,7 @@
       ];
 
       var trial = {
-        type: jsPsychSurveyLIkert,
+        type: jsPsychSurveyLikert,
         questions: [
           {prompt: "I like vegetables.", name: 'Vegetables', labels: likert_scale},
           {prompt: "I like fruit.", name: 'Fruit', labels: likert_scale},

7.0/demos/jspsych-visual-search-circle-demo2.html

@@ -51,8 +51,7 @@
 
       var trial = {
         type: jsPsychVisualSearchCircle,
-        target: 'img/elephant.png',
-        foil: ['img/lion.png', 'img/monkey.png'],
+        stimuli: ['img/elephant.png', 'img/lion.png', 'img/monkey.png'],
         fixation_image: 'img/fixation.gif',
         target_present_key: 'e',
         target_absent_key: 'n',

7.0/plugins/image-keyboard-response/index.html

@@ -1684,7 +1684,15 @@
 </tbody>
 </table>
 <h2 id="examples">Examples<a class="headerlink" href="#examples" title="Permanent link">&para;</a></h2>
-<details class="example" open="open"><summary>Displaying trial until subject gives a response</summary><div class="tabbed-set" data-tabs="1:2"><input checked="checked" id="__tabbed_1_1" name="__tabbed_1" type="radio" /><label for="__tabbed_1_1">Code</label><div class="tabbed-content"></div>
+<details class="example" open="open"><summary>Displaying trial until subject gives a response</summary><div class="tabbed-set" data-tabs="1:2"><input checked="checked" id="__tabbed_1_1" name="__tabbed_1" type="radio" /><label for="__tabbed_1_1">Code</label><div class="tabbed-content">
+<div class="highlight"><pre><span></span><code><span class="kd">var</span> <span class="nx">trial</span> <span class="o">=</span> <span class="p">{</span>
+    <span class="nx">type</span><span class="o">:</span> <span class="nx">jsPsychImageKeyboardResponse</span><span class="p">,</span>
+    <span class="nx">stimulus</span><span class="o">:</span> <span class="s1">&#39;img/happy_face_1.png&#39;</span><span class="p">,</span>
+    <span class="nx">choices</span><span class="o">:</span> <span class="p">[</span><span class="s1">&#39;e&#39;</span><span class="p">,</span> <span class="s1">&#39;i&#39;</span><span class="p">],</span>
+    <span class="nx">prompt</span><span class="o">:</span> <span class="s2">&quot;&lt;p&gt;Is this person happy or sad? Press &#39;e&#39; for happy and &#39;i&#39; for sad.&lt;/p&gt;&quot;</span><span class="p">,</span>
+<span class="p">};</span>
+</code></pre></div>
+</div>
 <input id="__tabbed_1_2" name="__tabbed_1" type="radio" /><label for="__tabbed_1_2">Demo</label><div class="tabbed-content">
 <p><div style="text-align:center;">
     <iframe src="../../demos/jspsych-image-keyboard-response-demo1.html" width="90%;" height="600px;" frameBorder="0"></iframe>

7.0/plugins/maxdiff/index.html

@@ -1659,7 +1659,15 @@
 </tbody>
 </table>
 <h2 id="examples">Examples<a class="headerlink" href="#examples" title="Permanent link">&para;</a></h2>
-<details class="example" open="open"><summary>Basic example</summary><div class="tabbed-set" data-tabs="1:2"><input checked="checked" id="__tabbed_1_1" name="__tabbed_1" type="radio" /><label for="__tabbed_1_1">Code</label><div class="tabbed-content"></div>
+<details class="example" open="open"><summary>Basic example</summary><div class="tabbed-set" data-tabs="1:2"><input checked="checked" id="__tabbed_1_1" name="__tabbed_1" type="radio" /><label for="__tabbed_1_1">Code</label><div class="tabbed-content">
+<div class="highlight"><pre><span></span><code><span class="kd">var</span> <span class="nx">maxdiff_page</span> <span class="o">=</span> <span class="p">{</span>
+    <span class="nx">type</span><span class="o">:</span> <span class="nx">jsPsychMaxdiff</span><span class="p">,</span>
+    <span class="nx">alternatives</span><span class="o">:</span> <span class="p">[</span><span class="s1">&#39;apple&#39;</span><span class="p">,</span> <span class="s1">&#39;orange&#39;</span><span class="p">,</span> <span class="s1">&#39;pear&#39;</span><span class="p">,</span> <span class="s1">&#39;banana&#39;</span><span class="p">],</span>
+    <span class="nx">labels</span><span class="o">:</span> <span class="p">[</span><span class="s1">&#39;Most Preferred&#39;</span><span class="p">,</span> <span class="s1">&#39;Least Preferred&#39;</span><span class="p">],</span>
+    <span class="nx">preamble</span><span class="o">:</span> <span class="s1">&#39;&lt;p&gt; Please select your &lt;b&gt;most preferred&lt;/b&gt; and &lt;b&gt;least preferred&lt;/b&gt; fruits. &lt;/p&gt;&#39;</span>
+<span class="p">};</span>
+</code></pre></div>
+</div>
 <input id="__tabbed_1_2" name="__tabbed_1" type="radio" /><label for="__tabbed_1_2">Demo</label><div class="tabbed-content">
 <p><div style="text-align:center;">
     <iframe src="../../demos/jspsych-maxdiff-demo1.html" width="90%;" height="500px;" frameBorder="0"></iframe>

7.0/plugins/resize/index.html

@@ -1654,7 +1654,16 @@
 </tbody>
 </table>
 <h2 id="examples">Examples<a class="headerlink" href="#examples" title="Permanent link">&para;</a></h2>
-<details class="example" open="open"><summary>Measuring a credit card and resizing the display to have 150 pixels equal an inch.</summary><div class="tabbed-set" data-tabs="1:2"><input checked="checked" id="__tabbed_1_1" name="__tabbed_1" type="radio" /><label for="__tabbed_1_1">Code</label><div class="tabbed-content"></div>
+<details class="example" open="open"><summary>Measuring a credit card and resizing the display to have 150 pixels equal an inch.</summary><div class="tabbed-set" data-tabs="1:2"><input checked="checked" id="__tabbed_1_1" name="__tabbed_1" type="radio" /><label for="__tabbed_1_1">Code</label><div class="tabbed-content">
+<div class="highlight"><pre><span></span><code><span class="kd">var</span> <span class="nx">inputs</span> <span class="o">=</span> <span class="p">{</span>
+    <span class="nx">type</span><span class="o">:</span> <span class="nx">jsPsychResize</span><span class="p">,</span>
+    <span class="nx">item_width</span><span class="o">:</span> <span class="mf">3</span> <span class="o">+</span> <span class="mf">3</span><span class="o">/</span><span class="mf">8</span><span class="p">,</span>
+    <span class="nx">item_height</span><span class="o">:</span> <span class="mf">2</span> <span class="o">+</span> <span class="mf">1</span><span class="o">/</span><span class="mf">8</span><span class="p">,</span>
+    <span class="nx">prompt</span><span class="o">:</span> <span class="s2">&quot;&lt;p&gt;Click and drag the lower right corner of the box until the box is the same size as a credit card held up to the screen.&lt;/p&gt;&quot;</span><span class="p">,</span>
+    <span class="nx">pixels_per_unit</span><span class="o">:</span> <span class="mf">150</span>
+<span class="p">};</span>
+</code></pre></div>
+</div>
 <input id="__tabbed_1_2" name="__tabbed_1" type="radio" /><label for="__tabbed_1_2">Demo</label><div class="tabbed-content">
 <p><div style="text-align:center;">
     <iframe src="../../demos/jspsych-resize-demo1.html" width="90%;" height="500px;" frameBorder="0"></iframe>

7.0/plugins/virtual-chinrest/index.html

@@ -1778,21 +1778,62 @@
 </tbody>
 </table>
 <h2 id="example">Example<a class="headerlink" href="#example" title="Permanent link">&para;</a></h2>
-<details class="example" open="open"><summary>Measure distance to screen and pixel ratio; no resizing</summary><div class="tabbed-set" data-tabs="1:2"><input checked="checked" id="__tabbed_1_1" name="__tabbed_1" type="radio" /><label for="__tabbed_1_1">Code</label><div class="tabbed-content"></div>
+<details class="example" open="open"><summary>Measure distance to screen and pixel ratio; no resizing</summary><div class="tabbed-set" data-tabs="1:2"><input checked="checked" id="__tabbed_1_1" name="__tabbed_1" type="radio" /><label for="__tabbed_1_1">Code</label><div class="tabbed-content">
+<div class="highlight"><pre><span></span><code><span class="kd">var</span> <span class="nx">trial</span> <span class="o">=</span> <span class="p">{</span>
+    <span class="nx">type</span><span class="o">:</span> <span class="nx">jsPsychVirtualChinrest</span><span class="p">,</span>
+    <span class="nx">blindspot_reps</span><span class="o">:</span> <span class="mf">3</span><span class="p">,</span>
+    <span class="nx">resize_units</span><span class="o">:</span> <span class="s2">&quot;none&quot;</span>
+<span class="p">};</span>
+</code></pre></div>
+</div>
 <input id="__tabbed_1_2" name="__tabbed_1" type="radio" /><label for="__tabbed_1_2">Demo</label><div class="tabbed-content">
 <p>This demo requires a larger viewing area to complete. Please <a target="_blank" rel="noopener noreferrer" href="../../demos/jspsych-virtual-chinrest-demo1.html">open the demo in a new tab</a></p>
 </div>
 </div>
 <p><a target="_blank" rel="noopener noreferrer" href="../../demos/jspsych-virtual-chinrest-demo1.html">Open demo in new tab</a></p>
 </details>
-<details class="example" open="open"><summary>Resizing based on centimeters per pixel</summary><div class="tabbed-set" data-tabs="2:2"><input checked="checked" id="__tabbed_2_1" name="__tabbed_2" type="radio" /><label for="__tabbed_2_1">Code</label><div class="tabbed-content"></div>
+<details class="example" open="open"><summary>Resizing based on centimeters per pixel</summary><div class="tabbed-set" data-tabs="2:2"><input checked="checked" id="__tabbed_2_1" name="__tabbed_2" type="radio" /><label for="__tabbed_2_1">Code</label><div class="tabbed-content">
+<div class="highlight"><pre><span></span><code><span class="kd">var</span> <span class="nx">trial</span> <span class="o">=</span> <span class="p">{</span>
+  <span class="nx">type</span><span class="o">:</span> <span class="nx">jsPsychVirtualChinrest</span><span class="p">,</span>
+  <span class="nx">blindspot_reps</span><span class="o">:</span> <span class="mf">3</span><span class="p">,</span>
+  <span class="nx">resize_units</span><span class="o">:</span> <span class="s2">&quot;cm&quot;</span><span class="p">,</span>
+  <span class="nx">pixels_per_unit</span><span class="o">:</span> <span class="mf">50</span>
+<span class="p">};</span>
+
+<span class="kd">var</span> <span class="nx">resized_stimulus</span> <span class="o">=</span> <span class="p">{</span>
+  <span class="nx">type</span><span class="o">:</span> <span class="nx">jsPsychHtmlButtonResponse</span><span class="p">,</span>
+  <span class="nx">stimulus</span><span class="o">:</span> <span class="sb">`</span>
+<span class="sb">    &lt;p&gt;If the measurements were done correctly, the square below should be 10 cm x 10 cm.&lt;/p&gt;</span>
+<span class="sb">    &lt;div style=&quot;background-color: black; width: 500px; height: 500px; margin: 20px auto;&quot;&gt;&lt;/div&gt;</span>
+<span class="sb">  `</span><span class="p">,</span>
+  <span class="nx">choices</span><span class="o">:</span> <span class="p">[</span><span class="s1">&#39;Continue&#39;</span><span class="p">]</span>
+<span class="p">}</span>
+</code></pre></div>
+</div>
 <input id="__tabbed_2_2" name="__tabbed_2" type="radio" /><label for="__tabbed_2_2">Demo</label><div class="tabbed-content">
 <p>This demo requires a larger viewing area to complete. Please <a target="_blank" rel="noopener noreferrer" href="../../demos/jspsych-virtual-chinrest-demo2.html">open the demo in a new tab</a></p>
 </div>
 </div>
 <p><a target="_blank" rel="noopener noreferrer" href="../../demos/jspsych-virtual-chinrest-demo2.html">Open demo in new tab</a></p>
 </details>
-<details class="example" open="open"><summary>Resizing based on degrees of visual angle per pixel</summary><div class="tabbed-set" data-tabs="3:2"><input checked="checked" id="__tabbed_3_1" name="__tabbed_3" type="radio" /><label for="__tabbed_3_1">Code</label><div class="tabbed-content"></div>
+<details class="example" open="open"><summary>Resizing based on degrees of visual angle per pixel</summary><div class="tabbed-set" data-tabs="3:2"><input checked="checked" id="__tabbed_3_1" name="__tabbed_3" type="radio" /><label for="__tabbed_3_1">Code</label><div class="tabbed-content">
+<div class="highlight"><pre><span></span><code><span class="kd">var</span> <span class="nx">trial</span> <span class="o">=</span> <span class="p">{</span>
+  <span class="nx">type</span><span class="o">:</span> <span class="nx">jsPsychVirtualChinrest</span><span class="p">,</span>
+  <span class="nx">blindspot_reps</span><span class="o">:</span> <span class="mf">3</span><span class="p">,</span>
+  <span class="nx">resize_units</span><span class="o">:</span> <span class="s2">&quot;deg&quot;</span><span class="p">,</span>
+  <span class="nx">pixels_per_unit</span><span class="o">:</span> <span class="mf">50</span>
+<span class="p">};</span>
+
+<span class="kd">var</span> <span class="nx">resized_stimulus</span> <span class="o">=</span> <span class="p">{</span>
+  <span class="nx">type</span><span class="o">:</span> <span class="nx">jsPsychHtmlButtonResponse</span><span class="p">,</span>
+  <span class="nx">stimulus</span><span class="o">:</span> <span class="sb">`</span>
+<span class="sb">    &lt;p&gt;If the measurements were done correctly, the square below should take up about 10 degrees of visual angle.&lt;/p&gt;</span>
+<span class="sb">    &lt;div style=&quot;background-color: black; width: 500px; height: 500px; margin: 20px auto;&quot;&gt;&lt;/div&gt;</span>
+<span class="sb">  `</span><span class="p">,</span>
+  <span class="nx">choices</span><span class="o">:</span> <span class="p">[</span><span class="s1">&#39;Continue&#39;</span><span class="p">]</span>
+<span class="p">}</span>
+</code></pre></div>
+</div>
 <input id="__tabbed_3_2" name="__tabbed_3" type="radio" /><label for="__tabbed_3_2">Demo</label><div class="tabbed-content">
 <p>This demo requires a larger viewing area to complete. Please <a target="_blank" rel="noopener noreferrer" href="../../demos/jspsych-virtual-chinrest-demo3.html">open the demo in a new tab</a></p>
 </div>

7.0/plugins/visual-search-circle/index.html

@@ -1759,8 +1759,7 @@ OR</li>
 
 <span class="kd">var</span> <span class="nx">trial</span> <span class="o">=</span> <span class="p">{</span>
   <span class="nx">type</span><span class="o">:</span> <span class="nx">jsPsychVisualSearchCircle</span><span class="p">,</span>
-  <span class="nx">target</span><span class="o">:</span> <span class="s1">&#39;img/elephant.png&#39;</span><span class="p">,</span>
-  <span class="nx">foil</span><span class="o">:</span> <span class="p">[</span><span class="s1">&#39;img/lion.png&#39;</span><span class="p">,</span> <span class="s1">&#39;img/monkey.png&#39;</span><span class="p">],</span>
+  <span class="nx">stimuli</span><span class="o">:</span> <span class="p">[</span><span class="s1">&#39;img/elephant.png&#39;</span><span class="p">,</span> <span class="s1">&#39;img/lion.png&#39;</span><span class="p">,</span> <span class="s1">&#39;img/monkey.png&#39;</span><span class="p">],</span>
   <span class="nx">fixation_image</span><span class="o">:</span> <span class="s1">&#39;img/fixation.gif&#39;</span><span class="p">,</span>
   <span class="nx">target_present_key</span><span class="o">:</span> <span class="s1">&#39;e&#39;</span><span class="p">,</span>
   <span class="nx">target_absent_key</span><span class="o">:</span> <span class="s1">&#39;n&#39;</span><span class="p">,</span>