Commit 562a553a authored by Thomas Pronk's avatar Thomas Pronk

Update to 2021.1.4

parent a6f0a106
......@@ -58,12 +58,12 @@ psychoJS.start({
expName: expName,
expInfo: expInfo,
resources: [
{'name': 'green_blue.png', 'path': 'green_blue.png'},
{'name': 'blue_red.png', 'path': 'blue_red.png'},
{'name': 'blue_blue.png', 'path': 'blue_blue.png'},
{'name': 'green_green.png', 'path': 'green_green.png'},
{'name': 'red_red.png', 'path': 'red_red.png'},
{'name': 'trialTypes.xlsx', 'path': 'trialTypes.xlsx'}
{'name': 'blue_red.png', 'path': 'blue_red.png'},
{'name': 'blue_blue.png', 'path': 'blue_blue.png'},
{'name': 'trialTypes.xlsx', 'path': 'trialTypes.xlsx'},
{'name': 'green_blue.png', 'path': 'green_blue.png'}
]
});
......@@ -72,7 +72,7 @@ psychoJS.experimentLogger.setLevel(core.Logger.ServerLevel.EXP);
function updateInfo() {
expInfo['date'] = util.MonotonicClock.getDateStr(); // add a simple timestamp
expInfo['expName'] = expName;
expInfo['psychopyVersion'] = '2021.1.3';
expInfo['psychopyVersion'] = '2021.1.4';
expInfo['OS'] = window.navigator.platform;
// store frame rate of monitor if we can measure it successfully
......@@ -267,6 +267,7 @@ function welcome_participantRoutineEnd(snapshot) {
thisComponent.setAutoDraw(false);
}
});
welcome_resp.stop();
// the Routine "welcome_participant" was not non-slip safe, so reset the non-slip timer
routineTimer.reset();
......@@ -375,6 +376,7 @@ function announce_sessionRoutineEnd(snapshot) {
thisComponent.setAutoDraw(false);
}
});
key_resp.stop();
// the Routine "announce_session" was not non-slip safe, so reset the non-slip timer
routineTimer.reset();
......@@ -481,6 +483,7 @@ function instructRoutineEnd(snapshot) {
thisComponent.setAutoDraw(false);
}
});
ready.stop();
// the Routine "instruct" was not non-slip safe, so reset the non-slip timer
routineTimer.reset();
......
......@@ -2,13 +2,13 @@
* Assignment_Stroop Test *
**************************/
import { PsychoJS } from './lib/core-2021.1.3.js';
import * as core from './lib/core-2021.1.3.js';
import { TrialHandler } from './lib/data-2021.1.3.js';
import { Scheduler } from './lib/util-2021.1.3.js';
import * as visual from './lib/visual-2021.1.3.js';
import * as sound from './lib/sound-2021.1.3.js';
import * as util from './lib/util-2021.1.3.js';
import { PsychoJS } from './lib/core-2021.1.4.js';
import * as core from './lib/core-2021.1.4.js';
import { TrialHandler } from './lib/data-2021.1.4.js';
import { Scheduler } from './lib/util-2021.1.4.js';
import * as visual from './lib/visual-2021.1.4.js';
import * as sound from './lib/sound-2021.1.4.js';
import * as util from './lib/util-2021.1.4.js';
//some handy aliases as in the psychopy scripts;
const { abs, sin, cos, PI: pi, sqrt } = Math;
const { round } = util;
......@@ -69,12 +69,12 @@ psychoJS.start({
expName: expName,
expInfo: expInfo,
resources: [
{'name': 'green_blue.png', 'path': 'green_blue.png'},
{'name': 'blue_red.png', 'path': 'blue_red.png'},
{'name': 'blue_blue.png', 'path': 'blue_blue.png'},
{'name': 'green_green.png', 'path': 'green_green.png'},
{'name': 'red_red.png', 'path': 'red_red.png'},
{'name': 'trialTypes.xlsx', 'path': 'trialTypes.xlsx'}
{'name': 'blue_red.png', 'path': 'blue_red.png'},
{'name': 'blue_blue.png', 'path': 'blue_blue.png'},
{'name': 'trialTypes.xlsx', 'path': 'trialTypes.xlsx'},
{'name': 'green_blue.png', 'path': 'green_blue.png'}
]
});
......@@ -83,7 +83,7 @@ psychoJS.experimentLogger.setLevel(core.Logger.ServerLevel.EXP);
function updateInfo() {
expInfo['date'] = util.MonotonicClock.getDateStr(); // add a simple timestamp
expInfo['expName'] = expName;
expInfo['psychopyVersion'] = '2021.1.3';
expInfo['psychopyVersion'] = '2021.1.4';
expInfo['OS'] = window.navigator.platform;
// store frame rate of monitor if we can measure it successfully
......@@ -277,6 +277,7 @@ function welcome_participantRoutineEnd(snapshot) {
thisComponent.setAutoDraw(false);
}
}
welcome_resp.stop();
// the Routine "welcome_participant" was not non-slip safe, so reset the non-slip timer
routineTimer.reset();
......@@ -384,6 +385,7 @@ function announce_sessionRoutineEnd(snapshot) {
thisComponent.setAutoDraw(false);
}
}
key_resp.stop();
// the Routine "announce_session" was not non-slip safe, so reset the non-slip timer
routineTimer.reset();
......@@ -489,6 +491,7 @@ function instructRoutineEnd(snapshot) {
thisComponent.setAutoDraw(false);
}
}
ready.stop();
// the Routine "instruct" was not non-slip safe, so reset the non-slip timer
routineTimer.reset();
......
......@@ -8,7 +8,7 @@
<!-- styles -->
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.css">
<link rel="stylesheet" href="https://lib.pavlovia.org/psychojs-2021.1.3.css">
<link rel="stylesheet" href="https://lib.pavlovia.org/psychojs-2021.1.4.css">
</head>
<body>
......@@ -33,7 +33,7 @@
<!-- legacy browsers -->
<script nomodule type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/babel-polyfill/7.6.0/polyfill.min.js"></script>
<script nomodule type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/url-search-params/1.1.0/url-search-params.js"></script>
<script nomodule type="text/javascript" src="https://lib.pavlovia.org/psychojs-2021.1.3.js"></script>
<script nomodule type="text/javascript" src="https://lib.pavlovia.org/psychojs-2021.1.4.js"></script>
<script nomodule type="text/javascript" src="./assignment_stroop-legacy-browsers.js"></script>
</body>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment