scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2025-01-10 15:02:06 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #1045 from kchadha/broadcast-message-shadow-fix

Browse source 
Fix import of broadcast block empty string obscured shadow import
This commit is contained in:
kchadha 2018-04-11 18:13:20 -04:00 committed by GitHub
commit 7311b103fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/serialization/sb2.js
View file

@ -643,18 +643,16 @@ const parseBlock = function (sb2block, addBroadcastMsg, getVariableId, extension
// event_broadcast_menus have some extra properties to add to the // event_broadcast_menus have some extra properties to add to the
// field and a different value than the rest // field and a different value than the rest
if (expectedArg.inputOp === 'event_broadcast_menu') { if (expectedArg.inputOp === 'event_broadcast_menu') {
if (!shadowObscured) { // Need to update the broadcast message name map with
// Need to update the broadcast message name map with // the value of this field.
// the value of this field. // Also need to provide the fields[fieldName] object,
// Also need to provide the fields[fieldName] object, // so that we can later update its value property, e.g.
// so that we can later update its value property, e.g. // if sb2 message name is empty string, we will later
// if sb2 message name is empty string, we will later // replace this field's value with messageN
// replace this field's value with messageN // once we can traverse through all the existing message names
// once we can traverse through all the existing message names // and come up with a fresh messageN.
// and come up with a fresh messageN. const broadcastId = addBroadcastMsg(fieldValue, fields[fieldName]);
const broadcastId = addBroadcastMsg(fieldValue, fields[fieldName]); fields[fieldName].id = broadcastId;
fields[fieldName].id = broadcastId;
}
fields[fieldName].variableType = expectedArg.variableType; fields[fieldName].variableType = expectedArg.variableType;
} }
activeBlock.children.push({ activeBlock.children.push({