Skip to content

Commit 7d94a34

Browse files
author
Neil Fraser
committed
Initialize generated JS and Dart variables in one line.
1 parent ff18d96 commit 7d94a34

File tree

2 files changed

+14
-10
lines changed

2 files changed

+14
-10
lines changed

generators/dart.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,14 @@ Blockly.Dart.init = function(workspace) {
9191

9292
var defvars = [];
9393
var variables = Blockly.Variables.allVariables(workspace);
94-
for (var i = 0; i < variables.length; i++) {
95-
defvars[i] = 'var ' +
96-
Blockly.Dart.variableDB_.getName(variables[i],
97-
Blockly.Variables.NAME_TYPE) + ';';
94+
if (variables.length) {
95+
for (var i = 0; i < variables.length; i++) {
96+
defvars[i] = Blockly.Dart.variableDB_.getName(variables[i],
97+
Blockly.Variables.NAME_TYPE);
98+
}
99+
Blockly.Dart.definitions_['variables'] =
100+
'var ' + defvars.join(', ') + ';';
98101
}
99-
Blockly.Dart.definitions_['variables'] = defvars.join('\n');
100102
};
101103

102104
/**

generators/javascript.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -123,12 +123,14 @@ Blockly.JavaScript.init = function(workspace) {
123123

124124
var defvars = [];
125125
var variables = Blockly.Variables.allVariables(workspace);
126-
for (var i = 0; i < variables.length; i++) {
127-
defvars[i] = 'var ' +
128-
Blockly.JavaScript.variableDB_.getName(variables[i],
129-
Blockly.Variables.NAME_TYPE) + ';';
126+
if (variables.length) {
127+
for (var i = 0; i < variables.length; i++) {
128+
defvars[i] = Blockly.JavaScript.variableDB_.getName(variables[i],
129+
Blockly.Variables.NAME_TYPE);
130+
}
131+
Blockly.JavaScript.definitions_['variables'] =
132+
'var ' + defvars.join(', ') + ';';
130133
}
131-
Blockly.JavaScript.definitions_['variables'] = defvars.join('\n');
132134
};
133135

134136
/**

0 commit comments

Comments
 (0)