scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-25 07:22:33 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Don't overwrite hat block's fields

Browse source 
Due to a typo (I believe) we were overwriting a horizontal hat block's
fields list when collecting hat block inputs. Now we collect inputs into
a temporary object in this case.
This commit is contained in:
Christopher Willis-Ford 2017-10-13 01:46:35 -07:00
parent ef3feca385
commit 96fa7315d5
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/engine/runtime.js
View file

@ -409,6 +409,9 @@ class Runtime extends EventEmitter {
const opcode = convertedBlock.json.type; const opcode = convertedBlock.json.type;
categoryInfo.blocks.push(convertedBlock); categoryInfo.blocks.push(convertedBlock);
this._primitives[opcode] = convertedBlock.info.func; this._primitives[opcode] = convertedBlock.info.func;
if (blockInfo.blockType === BlockType.HAT) {
this._hats[opcode] = {edgeActivated: true}; /** @TODO let extension specify this */
}
} }
this.emit(Runtime.EXTENSION_ADDED, categoryInfo.blocks); this.emit(Runtime.EXTENSION_ADDED, categoryInfo.blocks);
@ -802,13 +805,14 @@ class Runtime extends EventEmitter {
// If no fields are present, check inputs (horizontal blocks) // If no fields are present, check inputs (horizontal blocks)
if (Object.keys(hatFields).length === 0) { if (Object.keys(hatFields).length === 0) {
hatFields = {}; // don't overwrite the block's actual fields list
const hatInputs = blocks.getInputs(block); const hatInputs = blocks.getInputs(block);
for (const input in hatInputs) { for (const input in hatInputs) {
if (!hatInputs.hasOwnProperty(input)) continue; if (!hatInputs.hasOwnProperty(input)) continue;
const id = hatInputs[input].block; const id = hatInputs[input].block;
const inpBlock = blocks.getBlock(id); const inpBlock = blocks.getBlock(id);
const fields = blocks.getFields(inpBlock); const fields = blocks.getFields(inpBlock);
hatFields = Object.assign(fields, hatFields); Object.assign(hatFields, fields);
} }
} }