HoshinoKoji/psychojs
1
0
Fork 0
mirror of https://github.com/psychopy/psychojs.git synced 2025-05-10 10:40:54 +00:00
Code Actions Packages Releases Activity

Merge pull request #481 from apitiot/2022.1.1

Browse Source 
2022.1.1
This commit is contained in:
Alain Pitiot 2022-02-18 11:12:55 +01:00 committed by GitHub
commit 52df4e0421
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "psychojs",
"version": "2022.1.0",
"version": "2022.1.1",
"private": true,
"description": "Helps run in-browser neuroscience, psychology, and psychophysics experiments",
"license": "MIT",

2
src/core/GUI.js
View File

@ -532,7 +532,7 @@ export class GUI
_updateOkButtonStatus(changeFocus = true)
{
if (
this._psychoJS.getEnvironment() === ExperimentHandler.Environment.LOCAL
(this._psychoJS.getEnvironment() === ExperimentHandler.Environment.LOCAL)
|| (this._allResourcesDownloaded && this._setRequiredKeys && this._setRequiredKeys.size >= this._requiredKeys.length)
)
{

2
src/core/PsychoJS.js
View File

@ -176,7 +176,7 @@ export class PsychoJS
}
this.logger.info("[PsychoJS] Initialised.");
this.logger.info("[PsychoJS] @version 2022.1.0");
this.logger.info("[PsychoJS] @version 2022.1.1");
// hide the initialisation message:
jQuery("#root").addClass("is-ready");

4
src/core/ServerManager.js
View File

@ -572,6 +572,10 @@ export class ServerManager extends PsychObject
// note: we return a Promise that will be resolved when all the resources are downloaded
if (resourcesToDownload.size === 0)
{
this.emit(ServerManager.Event.RESOURCE, {
message: ServerManager.Event.DOWNLOAD_COMPLETED,
});
return Promise.resolve();
}
else