mirror of
https://github.com/scratchfoundation/scratch-vm.git
synced 2024-12-22 22:12:28 -05:00
Fix _removeThread documentation and add toggleStack
This commit is contained in:
parent
69450031cd
commit
96123f870f
4 changed files with 67 additions and 8 deletions
|
@ -172,13 +172,27 @@ Runtime.prototype._pushThread = function (id) {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Remove a thread from the list of threads.
|
* Remove a thread from the list of threads.
|
||||||
* @param {!string} id ID of block that starts the stack
|
* @param {!Thread} thread Thread object to remove from actives
|
||||||
*/
|
*/
|
||||||
Runtime.prototype._removeThread = function (id) {
|
Runtime.prototype._removeThread = function (id) {
|
||||||
var i = this.threads.indexOf(id);
|
var i = this.threads.indexOf(id);
|
||||||
if (i > -1) this.threads.splice(i, 1);
|
if (i > -1) this.threads.splice(i, 1);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Toggle a stack
|
||||||
|
* @param {!string} stackId ID of block that starts the stack
|
||||||
|
*/
|
||||||
|
Runtime.prototype.toggleStack = function (stackId) {
|
||||||
|
// Remove any existing thread
|
||||||
|
for (var i = 0; i < this.threads.length; i++) {
|
||||||
|
if (this.threads[i].topBlock == stackId) {
|
||||||
|
this._removeThread(this.threads[i]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
this._pushThread(stackId);
|
||||||
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Repeatedly run `sequencer.stepThreads` and filter out
|
* Repeatedly run `sequencer.stepThreads` and filter out
|
||||||
* inactive threads after each iteration.
|
* inactive threads after each iteration.
|
||||||
|
|
|
@ -4,6 +4,10 @@
|
||||||
* @constructor
|
* @constructor
|
||||||
*/
|
*/
|
||||||
function Thread (firstBlock) {
|
function Thread (firstBlock) {
|
||||||
|
/**
|
||||||
|
* Top block of the thread
|
||||||
|
*/
|
||||||
|
this.topBlock = firstBlock;
|
||||||
/**
|
/**
|
||||||
* Next block that the thread will execute.
|
* Next block that the thread will execute.
|
||||||
* @type {string}
|
* @type {string}
|
||||||
|
|
49
vm.js
49
vm.js
|
@ -77,7 +77,7 @@
|
||||||
// Blocks
|
// Blocks
|
||||||
switch (e.type) {
|
switch (e.type) {
|
||||||
case 'create':
|
case 'create':
|
||||||
instance.runtime.createBlock(adapter(e));
|
instance.runtime.createBlock(adapter(e), false);
|
||||||
break;
|
break;
|
||||||
case 'change':
|
case 'change':
|
||||||
instance.runtime.changeBlock({
|
instance.runtime.changeBlock({
|
||||||
|
@ -103,6 +103,27 @@
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
instance.flyoutBlockListener = function (e) {
|
||||||
|
switch (e.type) {
|
||||||
|
case 'create':
|
||||||
|
instance.runtime.createBlock(adapter(e), true);
|
||||||
|
break;
|
||||||
|
case 'change':
|
||||||
|
instance.runtime.changeBlock({
|
||||||
|
id: e.blockId,
|
||||||
|
element: e.element,
|
||||||
|
name: e.name,
|
||||||
|
value: e.newValue
|
||||||
|
});
|
||||||
|
break;
|
||||||
|
case 'delete':
|
||||||
|
instance.runtime.deleteBlock({
|
||||||
|
id: e.blockId
|
||||||
|
});
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1207,7 +1228,7 @@
|
||||||
* Block management: create blocks and stacks from a `create` event
|
* Block management: create blocks and stacks from a `create` event
|
||||||
* @param {!Object} block Blockly create event to be processed
|
* @param {!Object} block Blockly create event to be processed
|
||||||
*/
|
*/
|
||||||
Runtime.prototype.createBlock = function (block) {
|
Runtime.prototype.createBlock = function (block, opt_isFlyoutBlock) {
|
||||||
// Create new block
|
// Create new block
|
||||||
this.blocks[block.id] = block;
|
this.blocks[block.id] = block;
|
||||||
|
|
||||||
|
@ -1224,7 +1245,9 @@
|
||||||
// Push block id to stacks array. New blocks are always a stack even if only
|
// 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
|
// momentary. If the new block is added to an existing stack this stack will
|
||||||
// be removed by the `moveBlock` method below.
|
// be removed by the `moveBlock` method below.
|
||||||
this.stacks.push(block.id);
|
if (!opt_isFlyoutBlock) {
|
||||||
|
this.stacks.push(block.id);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -1327,13 +1350,27 @@
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Remove a thread from the list of threads.
|
* Remove a thread from the list of threads.
|
||||||
* @param {!string} id ID of block that starts the stack
|
* @param {!Thread} thread Thread object to remove from actives
|
||||||
*/
|
*/
|
||||||
Runtime.prototype._removeThread = function (id) {
|
Runtime.prototype._removeThread = function (id) {
|
||||||
var i = this.threads.indexOf(id);
|
var i = this.threads.indexOf(id);
|
||||||
if (i > -1) this.threads.splice(i, 1);
|
if (i > -1) this.threads.splice(i, 1);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Toggle a stack
|
||||||
|
* @param {!string} stackId ID of block that starts the stack
|
||||||
|
*/
|
||||||
|
Runtime.prototype.toggleStack = function (stackId) {
|
||||||
|
// Remove any existing thread
|
||||||
|
for (var i = 0; i < this.threads.length; i++) {
|
||||||
|
if (this.threads[i].topBlock == stackId) {
|
||||||
|
this._removeThread(this.threads[i]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
this._pushThread(stackId);
|
||||||
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Repeatedly run `sequencer.stepThreads` and filter out
|
* Repeatedly run `sequencer.stepThreads` and filter out
|
||||||
* inactive threads after each iteration.
|
* inactive threads after each iteration.
|
||||||
|
@ -1499,6 +1536,10 @@
|
||||||
* @constructor
|
* @constructor
|
||||||
*/
|
*/
|
||||||
function Thread (firstBlock) {
|
function Thread (firstBlock) {
|
||||||
|
/**
|
||||||
|
* Top block of the thread
|
||||||
|
*/
|
||||||
|
this.topBlock = firstBlock;
|
||||||
/**
|
/**
|
||||||
* Next block that the thread will execute.
|
* Next block that the thread will execute.
|
||||||
* @type {string}
|
* @type {string}
|
||||||
|
|
6
vm.min.js
vendored
6
vm.min.js
vendored
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue