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

Merge pull request #372 from thewhodidthis/bf#367--movie-preload

Browse Source 
package: bring back PreloadJS and import for side effects in core/ServerManager
This commit is contained in:
Alain Pitiot 2021-06-08 13:52:26 +02:00 committed by GitHub
commit 4bcf81d315
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
package-lock.json generated
View File

@ -14,7 +14,7 @@
"moment": "^2.29.1", "moment": "^2.29.1",
"pako": "^1.0.10", "pako": "^1.0.10",
"pixi.js-legacy": "^6.0.4", "pixi.js-legacy": "^6.0.4",
"preload-js": "^0.6.3", "preloadjs": "github:CreateJS/PreloadJS",
"seedrandom": "^3.0.5", "seedrandom": "^3.0.5",
"tone": "^14.7.77", "tone": "^14.7.77",
"xlsx": "^0.17.0" "xlsx": "^0.17.0"
@ -1980,10 +1980,10 @@
"url": "https://opencollective.com/pixijs" "url": "https://opencollective.com/pixijs"
} }
}, },
"node_modules/preload-js": { "node_modules/preloadjs": {
"version": "0.6.3", "version": "1.0.1",
"resolved": "https://registry.npmjs.org/preload-js/-/preload-js-0.6.3.tgz", "resolved": "git+ssh://git@github.com/CreateJS/PreloadJS.git#eab00cf50fe2f6993c75e04ad7f7e5e9c9e9f083",
"integrity": "sha1-3LS3wOGC27ziZ3rU8s+u4uJbTfc=" "license": "MIT"
}, },
"node_modules/prelude-ls": { "node_modules/prelude-ls": {
"version": "1.2.1", "version": "1.2.1",
@ -4037,10 +4037,9 @@
"pixi.js": "6.0.4" "pixi.js": "6.0.4"
} }
}, },
"preload-js": { "preloadjs": {
"version": "0.6.3", "version": "git+ssh://git@github.com/CreateJS/PreloadJS.git#eab00cf50fe2f6993c75e04ad7f7e5e9c9e9f083",
"resolved": "https://registry.npmjs.org/preload-js/-/preload-js-0.6.3.tgz", "from": "preloadjs@github:CreateJS/PreloadJS"
"integrity": "sha1-3LS3wOGC27ziZ3rU8s+u4uJbTfc="
}, },
"prelude-ls": { "prelude-ls": {
"version": "1.2.1", "version": "1.2.1",

2
package.json
View File

@ -31,7 +31,7 @@
"moment": "^2.29.1", "moment": "^2.29.1",
"pako": "^1.0.10", "pako": "^1.0.10",
"pixi.js-legacy": "^6.0.4", "pixi.js-legacy": "^6.0.4",
"preload-js": "^0.6.3", "preloadjs": "github:CreateJS/PreloadJS",
"seedrandom": "^3.0.5", "seedrandom": "^3.0.5",
"tone": "^14.7.77", "tone": "^14.7.77",
"xlsx": "^0.17.0" "xlsx": "^0.17.0"

4
src/core/ServerManager.js
View File

@ -7,7 +7,7 @@
* @license Distributed under the terms of the MIT License * @license Distributed under the terms of the MIT License
*/ */
import createjs from 'preload-js'; import 'preloadjs';
import { Howl } from 'howler'; import { Howl } from 'howler';
import {PsychoJS} from './PsychoJS'; import {PsychoJS} from './PsychoJS';
import {PsychObject} from '../util/PsychObject'; import {PsychObject} from '../util/PsychObject';
@ -1045,7 +1045,7 @@ export class ServerManager extends PsychObject
manifest.push(/*new createjs.LoadItem().set(*/{ manifest.push(/*new createjs.LoadItem().set(*/{
id: name, id: name,
src: pathStatusData.path, src: pathStatusData.path,
type: createjs.LoadQueue.BINARY, //createjs.Types.BINARY, type: createjs.Types.BINARY,
crossOrigin: 'Anonymous' crossOrigin: 'Anonymous'
}/*)*/); }/*)*/);
} }