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

Fix #1538

Browse Source
This commit is contained in:
Rachel Fenichel
2018-01-26 15:20:19 -08:00
parent 5913f42b0a
commit 3b168f5370
8 changed files with 41 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
generators/dart.js
View File

@@ -112,8 +112,8 @@ Blockly.Dart.init = function(workspace) {
Blockly.Names.DEVELOPER_VARIABLE_TYPE));
}
// Add user variables.
var variables = workspace.getAllVariables();
// Add user variables, but only ones that are being used.
var variables = Blockly.Variables.allUsedVarModels(workspace);
for (var i = 0; i < variables.length; i++) {
defvars.push(Blockly.Dart.variableDB_.getName(variables[i].getId(),
Blockly.Variables.NAME_TYPE));

4
generators/javascript.js
View File

@@ -165,8 +165,8 @@ Blockly.JavaScript.init = function(workspace) {
Blockly.Names.DEVELOPER_VARIABLE_TYPE));
}
// Add user variables.
var variables = workspace.getAllVariables();
// Add user variables, but only ones that are being used.
var variables = Blockly.Variables.allUsedVarModels(workspace);
for (var i = 0; i < variables.length; i++) {
defvars.push(Blockly.JavaScript.variableDB_.getName(variables[i].getId(),
Blockly.Variables.NAME_TYPE));

4
generators/php.js
View File

@@ -159,8 +159,8 @@ Blockly.PHP.init = function(workspace) {
Blockly.Names.DEVELOPER_VARIABLE_TYPE) + ';');
}
// Add user-created variables.
var variables = workspace.getAllVariables();
// Add user variables, but only ones that are being used.
var variables = Blockly.Variables.allUsedVarModels(workspace);
for (var i = 0, variable; variable = variables[i]; i++) {
defvars.push(Blockly.PHP.variableDB_.getName(variable.getId(),
Blockly.Variables.NAME_TYPE) + ';');

9
generators/php/procedures.js
View File

@@ -35,7 +35,7 @@ Blockly.PHP['procedures_defreturn'] = function(block) {
var globals = [];
var varName;
var workspace = block.workspace;
var variables = workspace.getAllVariables() || [];
var variables = Blockly.Variables.allUsedVarModels(workspace) || [];
for (var i = 0, variable; variable = variables[i]; i++) {
varName = variable.name;
if (block.arguments_.indexOf(varName) == -1) {
@@ -49,7 +49,8 @@ Blockly.PHP['procedures_defreturn'] = function(block) {
globals.push(Blockly.PHP.variableDB_.getName(devVarList[i],
Blockly.Names.DEVELOPER_VARIABLE_TYPE));
}
globals = globals.length ? Blockly.PHP.INDENT + 'global ' + globals.join(', ') + ';\n' : '';
globals = globals.length ?
Blockly.PHP.INDENT + 'global ' + globals.join(', ') + ';\n' : '';
var funcName = Blockly.PHP.variableDB_.getName(
block.getFieldValue('NAME'), Blockly.Procedures.NAME_TYPE);
@@ -57,8 +58,8 @@ Blockly.PHP['procedures_defreturn'] = function(block) {
if (Blockly.PHP.STATEMENT_PREFIX) {
var id = block.id.replace(/\$/g, '$$$$'); // Issue 251.
branch = Blockly.PHP.prefixLines(
Blockly.PHP.STATEMENT_PREFIX.replace(/%1/g,
'\'' + id + '\''), Blockly.PHP.INDENT) + branch;
Blockly.PHP.STATEMENT_PREFIX.replace(
/%1/g, '\'' + id + '\''), Blockly.PHP.INDENT) + branch;
}
if (Blockly.PHP.INFINITE_LOOP_TRAP) {
branch = Blockly.PHP.INFINITE_LOOP_TRAP.replace(/%1/g,

4
generators/python.js
View File

@@ -170,8 +170,8 @@ Blockly.Python.init = function(workspace) {
Blockly.Names.DEVELOPER_VARIABLE_TYPE) + ' = None');
}
// Add user-created variables.
var variables = workspace.getAllVariables();
// Add user variables, but only ones that are being used.
var variables = Blockly.Variables.allUsedVarModels(workspace);
for (var i = 0; i < variables.length; i++) {
defvars.push(Blockly.Python.variableDB_.getName(variables[i].getId(),
Blockly.Variables.NAME_TYPE) + ' = None');

13
generators/python/procedures.js
View File

@@ -36,7 +36,7 @@ Blockly.Python['procedures_defreturn'] = function(block) {
var globals = [];
var varName;
var workspace = block.workspace;
var variables = workspace.getAllVariables() || [];
var variables = Blockly.Variables.allUsedVarModels(workspace) || [];
for (var i = 0, variable; variable = variables[i]; i++) {
varName = variable.name;
if (block.arguments_.indexOf(varName) == -1) {
@@ -51,15 +51,16 @@ Blockly.Python['procedures_defreturn'] = function(block) {
Blockly.Names.DEVELOPER_VARIABLE_TYPE));
}
globals = globals.length ? Blockly.Python.INDENT + 'global ' + globals.join(', ') + '\n' : '';
var funcName = Blockly.Python.variableDB_.getName(block.getFieldValue('NAME'),
Blockly.Procedures.NAME_TYPE);
globals = globals.length ?
Blockly.Python.INDENT + 'global ' + globals.join(', ') + '\n' : '';
var funcName = Blockly.Python.variableDB_.getName(
block.getFieldValue('NAME'), Blockly.Procedures.NAME_TYPE);
var branch = Blockly.Python.statementToCode(block, 'STACK');
if (Blockly.Python.STATEMENT_PREFIX) {
var id = block.id.replace(/\$/g, '$$$$'); // Issue 251.
branch = Blockly.Python.prefixLines(
Blockly.Python.STATEMENT_PREFIX.replace(/%1/g,
'\'' + id + '\''), Blockly.Python.INDENT) + branch;
Blockly.Python.STATEMENT_PREFIX.replace(
/%1/g, '\'' + id + '\''), Blockly.Python.INDENT) + branch;
}
if (Blockly.Python.INFINITE_LOOP_TRAP) {
branch = Blockly.Python.INFINITE_LOOP_TRAP.replace(/%1/g,