CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-08 01:20:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Simplify function statement toggle reconnection.

Browse Source
This commit is contained in:
Neil Fraser
2016-03-16 23:11:55 -07:00
parent a3b850b0d3
commit 0b5338b707
1 changed files with 3 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
blocks/procedures.js
View File

@@ -217,17 +217,8 @@ Blockly.Blocks['procedures_defnoreturn'] = {
if (hasStatements) {
this.setStatements_(true);
// Restore the stack, if one was saved.
var stackConnection = this.getInput('STACK').connection;
if (stackConnection.targetConnection ||
!this.statementConnection_ ||
this.statementConnection_.targetConnection ||
this.statementConnection_.getSourceBlock().workspace !=
this.workspace) {
// Block no longer exists or has been attached elsewhere.
this.statementConnection_ = null;
} else {
stackConnection.connect(this.statementConnection_);
}
Blockly.Mutator.reconnect(this.statementConnection_, this, 'STACK');
this.statementConnection_ = null;
} else {
// Save the stack, then disconnect it.
var stackConnection = this.getInput('STACK').connection;
@@ -512,10 +503,10 @@ Blockly.Blocks['procedures_callnoreturn'] = {
this.quarkArguments_ = paramIds;
return;
}
this.setCollapsed(false);
if (paramIds.length != paramNames.length) {
throw 'Error: paramNames and paramIds must be the same length.';
}
this.setCollapsed(false);
if (!this.quarkArguments_) {
// Initialize tracking for this block.
this.quarkConnections_ = {};