scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-24 06:52:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Call fixUpVariableReferences in installTargets, before emitting the workspace update.

Browse source
This commit is contained in:
Karishma Chadha 2018-06-20 12:12:33 -04:00
parent 889443fcef
commit b75a779540
3 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/serialization/sb2.js
View file

@ -668,13 +668,6 @@ const sb2import = function (json, runtime, optForceSprite, zip) {
}; };
return parseScratchObject(json, runtime, extensions, !optForceSprite, zip) return parseScratchObject(json, runtime, extensions, !optForceSprite, zip)
.then(targets => {
if (optForceSprite && targets.length === 1) {
const target = targets[0];
target.fixUpVariableReferences();
}
return targets;
})
.then(targets => ({ .then(targets => ({
targets, targets,
extensions extensions

7
src/serialization/sb3.js
View file

@ -937,13 +937,6 @@ const deserialize = function (json, runtime, zip, isSingleSprite) {
((isSingleSprite ? [json] : json.targets) || []).map(target => ((isSingleSprite ? [json] : json.targets) || []).map(target =>
parseScratchObject(target, runtime, extensions, zip)) parseScratchObject(target, runtime, extensions, zip))
) )
.then(targets => {
if (isSingleSprite && targets.length === 1) {
const target = targets[0];
target.fixUpVariableReferences();
}
return targets;
})
.then(targets => ({ .then(targets => ({
targets, targets,
extensions extensions

4
src/virtual-machine.js
View file

@ -386,6 +386,10 @@ class VirtualMachine extends EventEmitter {
this.editingTarget = targets[0]; this.editingTarget = targets[0];
} }
if (!wholeProject) {
this.editingTarget.fixUpVariableReferences();
}
// Update the VM user's knowledge of targets and blocks on the workspace. // Update the VM user's knowledge of targets and blocks on the workspace.
this.emitTargetsUpdate(); this.emitTargetsUpdate();
this.emitWorkspaceUpdate(); this.emitWorkspaceUpdate();