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

Clean up some text generator logic (#4342)

Browse Source
This commit is contained in:
Monica Kozbial
2020-09-30 15:18:40 -07:00
committed by GitHub
parent 81d355f5fa
commit ef6f3ebe8c
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
generators/javascript/text.js
View File

@@ -188,8 +188,6 @@ Blockly.JavaScript['text_getSubstring'] = function(block) {
var text = Blockly.JavaScript.valueToCode(block, 'STRING', var text = Blockly.JavaScript.valueToCode(block, 'STRING',
textOrder) || '\'\''; textOrder) || '\'\'';
if (where1 == 'FIRST' && where2 == 'LAST') { if (where1 == 'FIRST' && where2 == 'LAST') {
var text = Blockly.JavaScript.valueToCode(block, 'STRING',
Blockly.JavaScript.ORDER_NONE) || '\'\'';
var code = text; var code = text;
return [code, Blockly.JavaScript.ORDER_NONE]; return [code, Blockly.JavaScript.ORDER_NONE];
} else if (text.match(/^'?\w+'?$/) || requiresLengthCall) { } else if (text.match(/^'?\w+'?$/) || requiresLengthCall) {

6
generators/php/text.js
View File

@@ -153,14 +153,12 @@ Blockly.PHP['text_getSubstring'] = function(block) {
// Get substring. // Get substring.
var where1 = block.getFieldValue('WHERE1'); var where1 = block.getFieldValue('WHERE1');
var where2 = block.getFieldValue('WHERE2'); var where2 = block.getFieldValue('WHERE2');
var text = Blockly.PHP.valueToCode(block, 'STRING',
Blockly.PHP.ORDER_NONE) || '\'\'';
if (where1 == 'FIRST' && where2 == 'LAST') { if (where1 == 'FIRST' && where2 == 'LAST') {
var text = Blockly.PHP.valueToCode(block, 'STRING',
Blockly.PHP.ORDER_NONE) || '\'\'';
var code = text; var code = text;
return [code, Blockly.PHP.ORDER_NONE]; return [code, Blockly.PHP.ORDER_NONE];
} else { } else {
var text = Blockly.PHP.valueToCode(block, 'STRING',
Blockly.PHP.ORDER_NONE) || '\'\'';
var at1 = Blockly.PHP.getAdjusted(block, 'AT1'); var at1 = Blockly.PHP.getAdjusted(block, 'AT1');
var at2 = Blockly.PHP.getAdjusted(block, 'AT2'); var at2 = Blockly.PHP.getAdjusted(block, 'AT2');
var functionName = Blockly.PHP.provideFunction_( var functionName = Blockly.PHP.provideFunction_(