scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2025-08-28 22:30:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Check if storage module is present before using it

Browse source
This commit is contained in:
Christopher Willis-Ford 2017-03-13 15:06:28 -07:00
parent e4fd9d57a2
commit 6ad0f3351b
2 changed files with 21 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/import/sb2import.js
View file

@ -51,8 +51,9 @@ var parseScratchObject = function (object, runtime, topLevel) {
rotationCenterY: costumeSource.rotationCenterY,
skinId: null
};
if (runtime.renderer) {
costumePromises.push(loadCostume(costumeSource.baseLayerMD5, costume, runtime));
var costumePromise = loadCostume(costumeSource.baseLayerMD5, costume, runtime);
if (costumePromise) {
costumePromises.push(costumePromise);
}
sprite.costumes.push(costume);
}
@ -157,9 +158,18 @@ var parseScratchObject = function (object, runtime, topLevel) {
* @property {number} rotationCenterY - the Y component of the costume's origin.
* @property {number} [bitmapResolution] - the resolution scale for a bitmap costume.
* @param {!Runtime} runtime - Scratch runtime, used to access the storage module.
* @returns {Promise} - a promise which will resolve after skinId is set.
* @returns {Promise} - a promise which will resolve after skinId is set, or null on error.
*/
var loadCostume = function (md5ext, costume, runtime) {
if (!runtime.storage) {
log('No storage module present; cannot load costume asset: ', md5ext);
return null;
}
if (!runtime.renderer) {
log('No rendering module present; cannot load costume asset: ', md5ext);
return null;
}
var idParts = md5ext.split('.');
var md5 = idParts[0];
var ext = idParts[1].toUpperCase();
@ -212,6 +222,10 @@ var loadCostume = function (md5ext, costume, runtime) {
* @param {!Runtime} runtime - Scratch runtime, used to access the storage module.
*/
var loadSound = function (sound, runtime) {
if (!runtime.storage) {
log('No storage module present; cannot load sound asset: ', sound.md5);
return;
}
var idParts = sound.md5.split('.');
var md5 = idParts[0];
runtime.storage.load(AssetType.Sound, md5).then(function (soundAsset) {

4
src/virtual-machine.js
View file

@ -162,6 +162,10 @@ VirtualMachine.prototype.loadProject = function (json) {
* @param {string} id - the ID of the project to download, as a string.
*/
VirtualMachine.prototype.downloadProjectId = function (id) {
if (!this.runtime.storage) {
log('No storage module present; cannot load project: ', id);
return;
}
var vm = this;
var promise = this.runtime.storage.load(AssetType.Project, id);
promise.then(function (projectAsset) {