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

Automatic commit Wed Jan 15 03:00:09 PST 2014

Browse Source
This commit is contained in:
ellen.spertus
2014-01-15 03:00:09 -08:00
parent ce63f70b37
commit bd778cdfea
183 changed files with 2213 additions and 2072 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
generators/javascript/lists.js
View File

@@ -67,7 +67,7 @@ Blockly.JavaScript['lists_repeat'] = function(block) {
Blockly.JavaScript['lists_length'] = function(block) {
// List length.
var argument0 = Blockly.JavaScript.valueToCode(block, 'VALUE',
Blockly.JavaScript.ORDER_FUNCTION_CALL) || '\'\'';
Blockly.JavaScript.ORDER_FUNCTION_CALL) || '[]';
return [argument0 + '.length', Blockly.JavaScript.ORDER_MEMBER];
};

2
generators/javascript/logic.js
View File

@@ -43,7 +43,7 @@ Blockly.JavaScript['controls_if'] = function(block) {
}
if (block.elseCount_) {
branch = Blockly.JavaScript.statementToCode(block, 'ELSE');
code += ' else {\n' + branch + '}\n';
code += ' else {\n' + branch + '}';
}
return code + '\n';
};

21
generators/javascript/loops.js
View File

@@ -166,25 +166,12 @@ Blockly.JavaScript['controls_forEach'] = function(block) {
branch = Blockly.JavaScript.INFINITE_LOOP_TRAP.replace(/%1/g,
'\'' + block.id + '\'') + branch;
}
var code;
var indexVar = Blockly.JavaScript.variableDB_.getDistinctName(
variable0 + '_index', Blockly.Variables.NAME_TYPE);
if (argument0.match(/^\w+$/)) {
branch = ' ' + variable0 + ' = ' + argument0 + '[' + indexVar + '];\n' +
branch;
code = 'for (var ' + indexVar + ' in ' + argument0 + ') {\n' +
branch + '}\n';
} else {
// The list appears to be more complicated than a simple variable.
// Cache it to a variable to prevent repeated look-ups.
var listVar = Blockly.JavaScript.variableDB_.getDistinctName(
variable0 + '_list', Blockly.Variables.NAME_TYPE);
branch = ' ' + variable0 + ' = ' + listVar + '[' + indexVar + '];\n' +
branch;
code = 'var ' + listVar + ' = ' + argument0 + ';\n' +
'for (var ' + indexVar + ' in ' + listVar + ') {\n' +
branch + '}\n';
}
branch = ' ' + variable0 + ' = ' + argument0 + '[' + indexVar + '];\n' +
branch;
var code = 'for (var ' + indexVar + ' in ' + argument0 + ') {\n' +
branch + '}\n';
return code;
};

2
generators/javascript/text.js
View File

@@ -143,7 +143,7 @@ Blockly.JavaScript['text_charAt'] = function(block) {
Blockly.JavaScript['text_getSubstring'] = function(block) {
// Get substring.
var text = Blockly.JavaScript.valueToCode(block, 'STRING',
Blockly.JavaScript.ORDER_MEMBER) || '[]';
Blockly.JavaScript.ORDER_MEMBER) || '\'\'';
var where1 = block.getFieldValue('WHERE1');
var where2 = block.getFieldValue('WHERE2');
var at1 = Blockly.JavaScript.valueToCode(block, 'AT1',