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

Change it so we dont have to do string manipulation on IDs to get data out of events

Browse source
This commit is contained in:
DD 2017-11-16 17:19:51 -05:00
parent 0958db2618
commit 255e160ebb
6 changed files with 18 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/blocks/scratch3_looks.js
View file

@ -244,10 +244,10 @@ class Scratch3LooksBlocks {
getMonitored () { getMonitored () {
return { return {
size: {isSpriteSpecific: true}, looks_size: {isSpriteSpecific: true},
costumeorder: {isSpriteSpecific: true}, looks_costumeorder: {isSpriteSpecific: true},
backdroporder: {}, looks_backdroporder: {},
backdropname: {} looks_backdropname: {}
}; };
} }

6
src/blocks/scratch3_motion.js
View file

@ -40,9 +40,9 @@ class Scratch3MotionBlocks {
getMonitored () { getMonitored () {
return { return {
xposition: {isSpriteSpecific: true}, motion_xposition: {isSpriteSpecific: true},
yposition: {isSpriteSpecific: true}, motion_yposition: {isSpriteSpecific: true},
direction: {isSpriteSpecific: true} motion_direction: {isSpriteSpecific: true}
}; };
} }

10
src/blocks/scratch3_sensing.js
View file

@ -51,11 +51,11 @@ class Scratch3SensingBlocks {
getMonitored () { getMonitored () {
return { return {
answer: {}, sensing_answer: {},
loudness: {}, sensing_loudness: {},
timer: {}, sensing_timer: {},
of: {}, sensing_of: {},
current: {} sensing_current: {}
}; };
} }

2
src/blocks/scratch3_sound.js
View file

@ -105,7 +105,7 @@ class Scratch3SoundBlocks {
getMonitored () { getMonitored () {
return { return {
volume: {} sound_volume: {}
}; };
} }

11
src/engine/blocks.js
View file

@ -327,7 +327,11 @@ class Blocks {
break; break;
case 'checkbox': case 'checkbox':
block.isMonitored = args.value; block.isMonitored = args.value;
block.targetId = args.isSpriteSpecific ? this._getTargetIdFromBlockId(block.id) : null; if (optRuntime) {
const isSpriteSpecific = optRuntime.monitorBlockInfo.hasOwnProperty(block.opcode) &&
optRuntime.monitorBlockInfo[block.opcode].isSpriteSpecific;
block.targetId = isSpriteSpecific ? optRuntime.getEditingTarget().id : null;
}
if (optRuntime && wasMonitored && !block.isMonitored) { if (optRuntime && wasMonitored && !block.isMonitored) {
optRuntime.requestRemoveMonitor(block.id); optRuntime.requestRemoveMonitor(block.id);
} else if (optRuntime && !wasMonitored && block.isMonitored) { } else if (optRuntime && !wasMonitored && block.isMonitored) {
@ -416,11 +420,6 @@ class Blocks {
}); });
} }
_getTargetIdFromBlockId (blockId) {
// First word of block ID. See makeToolboxXML in scratch-gui
return blockId.split('_')[0];
}
/** /**
* Block management: delete blocks and their associated scripts. * Block management: delete blocks and their associated scripts.
* @param {!object} e Blockly delete event to be processed. * @param {!object} e Blockly delete event to be processed.

9
src/virtual-machine.js
View file

@ -578,15 +578,6 @@ class VirtualMachine extends EventEmitter {
// Filter events by type, since monitor blocks only need to listen to these events. // Filter events by type, since monitor blocks only need to listen to these events.
// Monitor blocks shouldn't be destroyed when flyout blocks are deleted. // Monitor blocks shouldn't be destroyed when flyout blocks are deleted.
if (['create', 'change'].indexOf(e.type) !== -1) { if (['create', 'change'].indexOf(e.type) !== -1) {
let blockType = e.blockId.split('_');
blockType = blockType[blockType.length - 1];
if (!this.runtime.monitorBlockInfo.hasOwnProperty(blockType)) {
return;
}
if (!this.runtime.monitorBlockInfo.hasOwnProperty(blockType) ||
this.runtime.monitorBlockInfo[blockType].isSpriteSpecific) {
e.isSpriteSpecific = true;
}
this.runtime.monitorBlocks.blocklyListen(e, this.runtime); this.runtime.monitorBlocks.blocklyListen(e, this.runtime);
} }
} }