scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2025-01-14 19:49:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #1718 from paulkaplan/block-id-on-drag-end

Browse source 
Include the original blockId of the top block being dragged.
This commit is contained in:
Paul Kaplan 2018-11-01 15:03:29 -04:00 committed by GitHub
commit bb6aa7644b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/engine/blocks.js
View file

@ -340,7 +340,7 @@ class Blocks {
// Drag blocks onto another sprite // Drag blocks onto another sprite
if (e.isOutside) { if (e.isOutside) {
const newBlocks = adapter(e); const newBlocks = adapter(e);
optRuntime.emitBlockEndDrag(newBlocks); optRuntime.emitBlockEndDrag(newBlocks, e.blockId);
} }
} }
break; break;

5
src/engine/runtime.js
View file

@ -1857,9 +1857,10 @@ class Runtime extends EventEmitter {
/** /**
* Emit event to indicate that the block drag has ended with the blocks outside the blocks workspace * Emit event to indicate that the block drag has ended with the blocks outside the blocks workspace
* @param {Array.<object>} blocks The set of blocks dragged to the GUI * @param {Array.<object>} blocks The set of blocks dragged to the GUI
* @param {string} topBlockId The original id of the top block being dragged
*/ */
emitBlockEndDrag (blocks) { emitBlockEndDrag (blocks, topBlockId) {
this.emit(Runtime.BLOCK_DRAG_END, blocks); this.emit(Runtime.BLOCK_DRAG_END, blocks, topBlockId);
} }
/** /**

4
src/virtual-machine.js
View file

@ -96,8 +96,8 @@ class VirtualMachine extends EventEmitter {
this.runtime.on(Runtime.BLOCK_DRAG_UPDATE, areBlocksOverGui => { this.runtime.on(Runtime.BLOCK_DRAG_UPDATE, areBlocksOverGui => {
this.emit(Runtime.BLOCK_DRAG_UPDATE, areBlocksOverGui); this.emit(Runtime.BLOCK_DRAG_UPDATE, areBlocksOverGui);
}); });
this.runtime.on(Runtime.BLOCK_DRAG_END, blocks => { this.runtime.on(Runtime.BLOCK_DRAG_END, (blocks, topBlockId) => {
this.emit(Runtime.BLOCK_DRAG_END, blocks); this.emit(Runtime.BLOCK_DRAG_END, blocks, topBlockId);
}); });
this.runtime.on(Runtime.EXTENSION_ADDED, blocksInfo => { this.runtime.on(Runtime.EXTENSION_ADDED, blocksInfo => {
this.emit(Runtime.EXTENSION_ADDED, blocksInfo); this.emit(Runtime.EXTENSION_ADDED, blocksInfo);