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

[WIP] Merge procedures.js but needs discussion

Browse Source
This commit is contained in:
Evan W. Patton
2016-10-01 02:26:54 -04:00
parent 9f47aaedcf
commit 0a1b08b73b
2 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/procedures.js
View File

@@ -89,6 +89,7 @@ Blockly.Procedures.findLegalName = function(name, block) {
// Flyouts can have multiple procedures called 'do something'.
return name;
}
name = name.replace(/\s+/g, '');
while (!Blockly.Procedures.isLegalName_(name, block.workspace, block)) {
// Collision with another procedure.
var r = name.match(/^(.*?)(\d+)$/);

16
core/procedures.js.rej
View File

@@ -1,20 +1,4 @@
***************
*** 99,104 ****
// Flyouts can have multiple procedures called 'procedure'.
return name;
}
while (!Blockly.Procedures.isLegalName(name, block.workspace, block)) {
// Collision with another procedure.
var r = name.match(/^(.*?)(\d+)$/);
--- 99,105 ----
// Flyouts can have multiple procedures called 'procedure'.
return name;
}
+ name = name.replace(/\s+/g, '');
while (!Blockly.Procedures.isLegalName(name, block.workspace, block)) {
// Collision with another procedure.
var r = name.match(/^(.*?)(\d+)$/);
***************
*** 255,266 ****
* @param {!Blockly.Workspace} workspace The workspace to delete callers from.
* @param {!Array.<string>} paramNames Array of new parameter names.