HoshinoKoji/jsPsych
1
0
Fork 0
mirror of https://github.com/jspsych/jsPsych.git synced 2025-05-10 19:20:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into modularization

Browse Source
This commit is contained in:
bjoluc 2021-09-30 18:20:13 +02:00 committed by GitHub
commit ada7df432c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/overview/eye-tracking.md
View File

@ -27,7 +27,7 @@ The [webgazer extension](/extensions/jspsych-ext-webgazer.md) adds functionality
```html
<head>
<script src="jspsych/jspsych.js"></script>
<script src="webgazer.js"></script>
<script src="js/webgazer/webgazer.js"></script>
<script src="jspsych/extensions/jspsych-ext-webgazer.js"></script>
</head>
```

4
docs/overview/media-preloading.md
View File

@ -65,7 +65,7 @@ var sound_trial = {
var video_trials = {
timeline: [
{
type: 'video',
type: 'video-keyboard-response',
stimulus: jsPsych.timelineVariable('video')
}
],
@ -117,7 +117,7 @@ var sound_trial = {
var video_trials = {
timeline: [
{
type: 'video',
type: 'video-keyboard-response',
stimulus: jsPsych.timelineVariable('video')
}
],

22
docs/tutorials/rt-task.md
View File

@ -112,7 +112,7 @@ var instructions = {
<div style='width: 700px;'>
<div style='float: left;'><img src='img/blue.png'></img>
<p class='small'><strong>Press the F key</strong></p></div>
<div class='float: right;'><img src='img/orange.png'></img>
<div style='float: right;'><img src='img/orange.png'></img>
<p class='small'><strong>Press the J key</strong></p></div>
</div>
<p>Press any key to begin.</p>
@ -170,7 +170,7 @@ timeline.push(instructions);
<div style='width: 700px;'>
<div style='float: left;'><img src='img/blue.png'></img>
<p class='small'><strong>Press the F key</strong></p></div>
<div class='float: right;'><img src='img/orange.png'></img>
<div style='float: right;'><img src='img/orange.png'></img>
<p class='small'><strong>Press the J key</strong></p></div>
</div>
<p>Press any key to begin.</p>
@ -260,7 +260,7 @@ timeline.push(blue_trial, orange_trial);
<div style='width: 700px;'>
<div style='float: left;'><img src='img/blue.png'></img>
<p class='small'><strong>Press the F key</strong></p></div>
<div class='float: right;'><img src='img/orange.png'></img>
<div style='float: right;'><img src='img/orange.png'></img>
<p class='small'><strong>Press the J key</strong></p></div>
</div>
<p>Press any key to begin.</p>
@ -372,7 +372,7 @@ timeline.push(preload);
<div style='width: 700px;'>
<div style='float: left;'><img src='img/blue.png'></img>
<p class='small'><strong>Press the F key</strong></p></div>
<div class='float: right;'><img src='img/orange.png'></img>
<div style='float: right;'><img src='img/orange.png'></img>
<p class='small'><strong>Press the J key</strong></p></div>
</div>
<p>Press any key to begin.</p>
@ -502,7 +502,7 @@ What happens when the experiment reaches the test procedure? jsPsych will run th
<div style='width: 700px;'>
<div style='float: left;'><img src='img/blue.png'></img>
<p class='small'><strong>Press the F key</strong></p></div>
<div class='float: right;'><img src='img/orange.png'></img>
<div style='float: right;'><img src='img/orange.png'></img>
<p class='small'><strong>Press the J key</strong></p></div>
</div>
<p>Press any key to begin.</p>
@ -613,7 +613,7 @@ var test_procedure = {
<div style='width: 700px;'>
<div style='float: left;'><img src='img/blue.png'></img>
<p class='small'><strong>Press the F key</strong></p></div>
<div class='float: right;'><img src='img/orange.png'></img>
<div style='float: right;'><img src='img/orange.png'></img>
<p class='small'><strong>Press the J key</strong></p></div>
</div>
<p>Press any key to begin.</p>
@ -722,7 +722,7 @@ In the code above, we replaced the `trial_duration: 1000` parameter in `fixation
<div style='width: 700px;'>
<div style='float: left;'><img src='img/blue.png'></img>
<p class='small'><strong>Press the F key</strong></p></div>
<div class='float: right;'><img src='img/orange.png'></img>
<div style='float: right;'><img src='img/orange.png'></img>
<p class='small'><strong>Press the J key</strong></p></div>
</div>
<p>Press any key to begin.</p>
@ -829,7 +829,7 @@ jsPsych.init({
<div style='width: 700px;'>
<div style='float: left;'><img src='img/blue.png'></img>
<p class='small'><strong>Press the F key</strong></p></div>
<div class='float: right;'><img src='img/orange.png'></img>
<div style='float: right;'><img src='img/orange.png'></img>
<p class='small'><strong>Press the J key</strong></p></div>
</div>
<p>Press any key to begin.</p>
@ -982,7 +982,7 @@ var fixation = {
<div style='width: 700px;'>
<div style='float: left;'><img src='img/blue.png'></img>
<p class='small'><strong>Press the F key</strong></p></div>
<div class='float: right;'><img src='img/orange.png'></img>
<div style='float: right;'><img src='img/orange.png'></img>
<p class='small'><strong>Press the J key</strong></p></div>
</div>
<p>Press any key to begin.</p>
@ -1111,7 +1111,7 @@ The `data.response` value is a string representation of the key the subject pres
<div style='width: 700px;'>
<div style='float: left;'><img src='img/blue.png'></img>
<p class='small'><strong>Press the F key</strong></p></div>
<div class='float: right;'><img src='img/orange.png'></img>
<div style='float: right;'><img src='img/orange.png'></img>
<p class='small'><strong>Press the J key</strong></p></div>
</div>
<p>Press any key to begin.</p>
@ -1255,7 +1255,7 @@ This code is available in the `/examples` folder in the jsPsych release download
<div style='width: 700px;'>
<div style='float: left;'><img src='img/blue.png'></img>
<p class='small'><strong>Press the F key</strong></p></div>
<div class='float: right;'><img src='img/orange.png'></img>
<div style='float: right;'><img src='img/orange.png'></img>
<p class='small'><strong>Press the J key</strong></p></div>
</div>
<p>Press any key to begin.</p>