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

Fix indentation bug if no xfix exists in function

Browse Source
This commit is contained in:
Neil Fraser
2019-05-14 16:55:52 -07:00
committed by Neil Fraser
parent 585866a1b6
commit 04e39c20f8
6 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/useragent.js
View File

@@ -54,8 +54,7 @@ goog.provide('Blockly.userAgent');
// Engines. Logic from:
// https://github.com/google/closure-library/blob/master/closure/goog/labs/useragent/engine.js
Blockly.userAgent.WEBKIT = has('WebKit') &&
!Blockly.userAgent.EDGE;
Blockly.userAgent.WEBKIT = has('WebKit') && !Blockly.userAgent.EDGE;
Blockly.userAgent.GECKO = has('Gecko') && !Blockly.userAgent.WEBKIT &&
!Blockly.userAgent.IE && !Blockly.userAgent.EDGE;

4
generators/dart/procedures.js
View File

@@ -40,7 +40,9 @@ Blockly.Dart['procedures_defreturn'] = function(block) {
if (Blockly.Dart.STATEMENT_SUFFIX) {
xfix1 += Blockly.Dart.injectId(Blockly.Dart.STATEMENT_SUFFIX, block);
}
xfix1 = Blockly.Dart.prefixLines(xfix1, Blockly.Dart.INDENT);
if (xfix1) {
xfix1 = Blockly.Dart.prefixLines(xfix1, Blockly.Dart.INDENT);
}
var loopTrap = '';
if (Blockly.Dart.INFINITE_LOOP_TRAP) {
loopTrap = Blockly.Dart.prefixLines(

4
generators/javascript/procedures.js
View File

@@ -42,7 +42,9 @@ Blockly.JavaScript['procedures_defreturn'] = function(block) {
xfix1 += Blockly.JavaScript.injectId(Blockly.JavaScript.STATEMENT_SUFFIX,
block);
}
xfix1 = Blockly.JavaScript.prefixLines(xfix1, Blockly.JavaScript.INDENT);
if (xfix1) {
xfix1 = Blockly.JavaScript.prefixLines(xfix1, Blockly.JavaScript.INDENT);
}
var loopTrap = '';
if (Blockly.JavaScript.INFINITE_LOOP_TRAP) {
loopTrap = Blockly.JavaScript.prefixLines(

4
generators/lua/procedures.js
View File

@@ -40,7 +40,9 @@ Blockly.Lua['procedures_defreturn'] = function(block) {
if (Blockly.Lua.STATEMENT_SUFFIX) {
xfix1 += Blockly.Lua.injectId(Blockly.Lua.STATEMENT_SUFFIX, block);
}
xfix1 = Blockly.Lua.prefixLines(xfix1, Blockly.Lua.INDENT);
if (xfix1) {
xfix1 = Blockly.Lua.prefixLines(xfix1, Blockly.Lua.INDENT);
}
var loopTrap = '';
if (Blockly.Lua.INFINITE_LOOP_TRAP) {
loopTrap = Blockly.Lua.prefixLines(

4
generators/php/procedures.js
View File

@@ -61,7 +61,9 @@ Blockly.PHP['procedures_defreturn'] = function(block) {
if (Blockly.PHP.STATEMENT_SUFFIX) {
xfix1 += Blockly.PHP.injectId(Blockly.PHP.STATEMENT_SUFFIX, block);
}
xfix1 = Blockly.PHP.prefixLines(xfix1, Blockly.PHP.INDENT);
if (xfix1) {
xfix1 = Blockly.PHP.prefixLines(xfix1, Blockly.PHP.INDENT);
}
var loopTrap = '';
if (Blockly.PHP.INFINITE_LOOP_TRAP) {
loopTrap = Blockly.PHP.prefixLines(

4
generators/python/procedures.js
View File

@@ -62,7 +62,9 @@ Blockly.Python['procedures_defreturn'] = function(block) {
if (Blockly.Python.STATEMENT_SUFFIX) {
xfix1 += Blockly.Python.injectId(Blockly.Python.STATEMENT_SUFFIX, block);
}
xfix1 = Blockly.Python.prefixLines(xfix1, Blockly.Python.INDENT);
if (xfix1) {
xfix1 = Blockly.Python.prefixLines(xfix1, Blockly.Python.INDENT);
}
var loopTrap = '';
if (Blockly.Python.INFINITE_LOOP_TRAP) {
loopTrap = Blockly.Python.prefixLines(