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

Declare developer variables before user variables. Rebuild generators.

Browse Source
This commit is contained in:
Rachel Fenichel
2018-01-17 17:38:26 -08:00
parent 3f61f71f35
commit 9a3dc70031
8 changed files with 38 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
generators/javascript.js
View File

@@ -155,13 +155,6 @@ Blockly.JavaScript.init = function(workspace) {
Blockly.JavaScript.variableDB_.setVariableMap(workspace.getVariableMap());
var defvars = [];
// Add user variables.
var variables = workspace.getAllVariables();
for (var i = 0; i < variables.length; i++) {
defvars[i] = Blockly.JavaScript.variableDB_.getName(variables[i].getId(),
Blockly.Variables.NAME_TYPE);
}
// Add developer variables (not created or named by the user).
var devVarList = Blockly.Variables.allDeveloperVariables(workspace);
for (var i = 0; i < devVarList.length; i++) {
@@ -169,6 +162,13 @@ Blockly.JavaScript.init = function(workspace) {
Blockly.Names.DEVELOPER_VARIABLE_TYPE));
}
// Add user variables.
var variables = workspace.getAllVariables();
for (var i = 0; i < variables.length; i++) {
defvars.push(Blockly.JavaScript.variableDB_.getName(variables[i].getId(),
Blockly.Variables.NAME_TYPE));
}
// Declare all of the variables.
if (defvars.length) {
Blockly.JavaScript.definitions_['variables'] =