Remove duplicated generators.

This commit is contained in:
Neil Fraser
2015-07-23 13:11:51 -07:00
parent ce6ad13fbb
commit bafb3016fd
14 changed files with 116 additions and 157 deletions

View File

@@ -233,9 +233,16 @@ Blockly.JavaScript['text_print'] = function(block) {
return 'window.alert(' + argument0 + ');\n';
};
Blockly.JavaScript['text_prompt'] = function(block) {
// Prompt function (internal message).
var msg = Blockly.JavaScript.quote_(block.getFieldValue('TEXT'));
Blockly.JavaScript['text_prompt_ext'] = function(block) {
// Prompt function.
if (block.getField('TEXT')) {
// Internal message.
var msg = Blockly.JavaScript.quote_(block.getFieldValue('TEXT'));
} else {
// External message.
var msg = Blockly.JavaScript.valueToCode(block, 'TEXT',
Blockly.JavaScript.ORDER_NONE) || '\'\'';
}
var code = 'window.prompt(' + msg + ')';
var toNumber = block.getFieldValue('TYPE') == 'NUMBER';
if (toNumber) {
@@ -244,14 +251,4 @@ Blockly.JavaScript['text_prompt'] = function(block) {
return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
};
Blockly.JavaScript['text_prompt_ext'] = function(block) {
// Prompt function (external message).
var msg = Blockly.JavaScript.valueToCode(block, 'TEXT',
Blockly.JavaScript.ORDER_NONE) || '\'\'';
var code = 'window.prompt(' + msg + ')';
var toNumber = block.getFieldValue('TYPE') == 'NUMBER';
if (toNumber) {
code = 'parseFloat(' + code + ')';
}
return [code, Blockly.JavaScript.ORDER_FUNCTION_CALL];
};
Blockly.JavaScript['text_prompt'] = Blockly.JavaScript['text_prompt_ext'];