scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-23 14:32:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Moving block updating code into blocks instead of runtime.

Browse source
This commit is contained in:
Karishma Chadha 2018-01-26 16:58:45 -05:00
parent 784341909b
commit 0b2eaa9e19
2 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/engine/blocks.js
View file

@ -321,7 +321,11 @@ class Blocks {
stage.renameVariable(e.varId, e.newName);
// Update all the blocks that use the renamed variable.
if (optRuntime) {
optRuntime.updateBlocksAfterVarRename(e.varId, e.newName);
const targets = optRuntime.targets;
for (let i = 0; i < targets.length; i++) {
const currTarget = targets[i];
currTarget.blocks.updateBlocksAfterVarRename(e.varId, e.newName);
}
}
break;
case 'var_delete':
@ -415,7 +419,7 @@ class Blocks {
const isSpriteSpecific = optRuntime.monitorBlockInfo.hasOwnProperty(block.opcode) &&
optRuntime.monitorBlockInfo[block.opcode].isSpriteSpecific;
block.targetId = isSpriteSpecific ? optRuntime.getEditingTarget().id : null;
if (wasMonitored && !block.isMonitored) {
optRuntime.requestRemoveMonitor(block.id);
} else if (!wasMonitored && block.isMonitored) {
@ -550,6 +554,29 @@ class Blocks {
this.resetCache();
}
/**
* Keep blocks up to date after a variable gets renamed.
* @param {string} varId The id of the variable that was renamed
* @param {string} newName The new name of the variable that was renamed
*/
updateBlocksAfterVarRename (varId, newName) {
const blocks = this._blocks;
for (const blockId in blocks) {
let varOrListField = null;
if (blocks[blockId].fields.VARIABLE) {
varOrListField = blocks[blockId].fields.VARIABLE;
} else if (blocks[blockId].fields.LIST) {
varOrListField = blocks[blockId].fields.LIST;
}
if (varOrListField) {
const currFieldId = varOrListField.id;
if (varId === currFieldId) {
varOrListField.value = newName;
}
}
}
}
// ---------------------------------------------------------------------
/**

27
src/engine/runtime.js
View file

@ -1581,33 +1581,6 @@ class Runtime extends EventEmitter {
disableProfiling () {
this.profiler = null;
}
/**
* Keep blocks up to date after a variable gets renamed.
* @param {string} varId The id of the variable that was renamed
* @param {string} newName The new name of the variable that was renamed
*/
updateBlocksAfterVarRename (varId, newName) {
const allTargets = this.targets;
for (let i = 0; i < allTargets.length; i++) {
const currTarget = allTargets[i];
const currBlocks = currTarget.blocks._blocks;
for (const blockId in currBlocks) {
let varOrListField = null;
if (currBlocks[blockId].fields.VARIABLE) {
varOrListField = currBlocks[blockId].fields.VARIABLE;
} else if (currBlocks[blockId].fields.LIST) {
varOrListField = currBlocks[blockId].fields.LIST;
}
if (varOrListField) {
const currFieldId = varOrListField.id;
if (varId === currFieldId) {
varOrListField.value = newName;
}
}
}
}
}
}
/**