scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2025-05-29 22:54:13 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions1

Update Runtime createBlock for new structure; _addStack helper.

Browse source
This commit is contained in:
Tim Mickel 2016-06-06 14:12:43 -04:00
parent b28c50e6a5
commit 0dfc72893c
1 changed files with 19 additions and 14 deletions

33
src/engine/runtime.js
View file

@ -91,21 +91,11 @@ Runtime.prototype.createBlock = function (block, opt_isFlyoutBlock) {
// Create new block
this.blocks[block.id] = block;
// Walk each field and add any shadow blocks
// @todo Expand this to cover vertical / nested blocks
for (var i in block.fields) {
var shadows = block.fields[i].blocks;
for (var y in shadows) {
var shadow = shadows[y];
this.blocks[shadow.id] = shadow;
}
}
// Push block id to stacks array. New blocks are always a stack even if only
// momentary. If the new block is added to an existing stack this stack will
// be removed by the `moveBlock` method below.
if (!opt_isFlyoutBlock) {
this.stacks.push(block.id);
this._addStack(block.id);
}
};
@ -132,8 +122,7 @@ Runtime.prototype.moveBlock = function (e) {
// Block was removed from parent
if (e.newParent === undefined && e.oldParent !== undefined) {
// Add stack
_this.stacks.push(e.id);
_this.addStack(e.id);
// Update old parent
if (e.oldField === undefined) {
@ -360,13 +349,29 @@ Runtime.prototype.start = function () {
// -----------------------------------------------------------------------------
// -----------------------------------------------------------------------------
/**
* Helper to add a stack to `this.stacks`
* @param {?string} id ID of block that starts the stack
*/
Runtime.prototype._addStack = function (id) {
var i = this.stacks.indexOf(id);
if (i > -1) return; // Already in stacks.
this.stacks.push(id);
// Update `topLevel` property on the top block.
this.blocks[id].topLevel = true;
};
/**
* Helper to remove a stack from `this.stacks`
* @param {?string} id ID of block that starts the stack
*/
Runtime.prototype._deleteStack = function (id) {
var i = this.stacks.indexOf(id);
if (i > -1) this.stacks.splice(i, 1);
if (i > -1) {
this.stacks.splice(i, 1);
// Update `topLevel` property on the top block.
this.blocks[id].topLevel = false;
}
};
/**