From f06bee4eca29a71846aab201b381804ee7d58938 Mon Sep 17 00:00:00 2001 From: alschmiedt Date: Tue, 27 Nov 2018 09:55:15 -0800 Subject: [PATCH] Fixes pull request comments --- core/generator.js | 4 ++-- generators/dart.js | 4 ++-- generators/javascript.js | 4 ++-- generators/lua.js | 4 ++-- generators/php.js | 4 ++-- generators/python.js | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/core/generator.js b/core/generator.js index 2ea0f3213..b5a794959 100644 --- a/core/generator.js +++ b/core/generator.js @@ -158,7 +158,7 @@ Blockly.Generator.prototype.allNestedComments = function(block) { /** * Generate code for the specified block (and attached blocks). * @param {Blockly.Block} block The block to generate code for. - * @param {boolean} opt_thisOnly True to generate code for only this block. + * @param {boolean=} opt_thisOnly True to generate code for only this statement. * @return {string|!Array} For statement blocks, the generated code. * For value blocks, an array containing the generated code and an * operator order value. Returns '' if block is null. @@ -169,7 +169,7 @@ Blockly.Generator.prototype.blockToCode = function(block, opt_thisOnly) { } if (block.disabled) { // Skip past this block if it is disabled. - return this.blockToCode(block.getNextBlock()); + return opt_thisOnly ? '' : this.blockToCode(block.getNextBlock()); } var func = this[block.type]; diff --git a/generators/dart.js b/generators/dart.js index a444105ff..cc24151d8 100644 --- a/generators/dart.js +++ b/generators/dart.js @@ -188,7 +188,7 @@ Blockly.Dart.quote_ = function(string) { * Calls any statements following this block. * @param {!Blockly.Block} block The current block. * @param {string} code The Dart code created for this block. - * @param {boolean} opt_thisOnly True to generate code for only this block. + * @param {boolean=} opt_thisOnly True to generate code for only this statement. * @return {string} Dart code with comments and subsequent blocks added. * @private */ @@ -222,7 +222,7 @@ Blockly.Dart.scrub_ = function(block, code, opt_thisOnly) { } } var nextBlock = block.nextConnection && block.nextConnection.targetBlock(); - var nextCode = opt_thisOnly ? "" : Blockly.Dart.blockToCode(nextBlock); + var nextCode = opt_thisOnly ? '' : Blockly.Dart.blockToCode(nextBlock); return commentCode + code + nextCode; }; diff --git a/generators/javascript.js b/generators/javascript.js index ba8b23440..ce38b726a 100644 --- a/generators/javascript.js +++ b/generators/javascript.js @@ -229,7 +229,7 @@ Blockly.JavaScript.quote_ = function(string) { * Calls any statements following this block. * @param {!Blockly.Block} block The current block. * @param {string} code The JavaScript code created for this block. - * @param {boolean} opt_thisOnly True to generate code for only this block. + * @param {boolean=} opt_thisOnly True to generate code for only this statement. * @return {string} JavaScript code with comments and subsequent blocks added. * @private */ @@ -265,7 +265,7 @@ Blockly.JavaScript.scrub_ = function(block, code, opt_thisOnly) { } } var nextBlock = block.nextConnection && block.nextConnection.targetBlock(); - var nextCode = opt_thisOnly ? "" : Blockly.JavaScript.blockToCode(nextBlock); + var nextCode = opt_thisOnly ? '' : Blockly.JavaScript.blockToCode(nextBlock); return commentCode + code + nextCode; }; diff --git a/generators/lua.js b/generators/lua.js index 81cce0d9f..0e05c24dc 100644 --- a/generators/lua.js +++ b/generators/lua.js @@ -162,7 +162,7 @@ Blockly.Lua.quote_ = function(string) { * Calls any statements following this block. * @param {!Blockly.Block} block The current block. * @param {string} code The Lua code created for this block. - * @param {boolean} opt_thisOnly True to generate code for only this block. + * @param {boolean=} opt_thisOnly True to generate code for only this statement. * @return {string} Lua code with comments and subsequent blocks added. * @private */ @@ -191,6 +191,6 @@ Blockly.Lua.scrub_ = function(block, code, opt_thisOnly) { } } var nextBlock = block.nextConnection && block.nextConnection.targetBlock(); - var nextCode = opt_thisOnly ? "" : Blockly.Lua.blockToCode(nextBlock); + var nextCode = opt_thisOnly ? '' : Blockly.Lua.blockToCode(nextBlock); return commentCode + code + nextCode; }; diff --git a/generators/php.js b/generators/php.js index 9cf4870af..cd717abe3 100644 --- a/generators/php.js +++ b/generators/php.js @@ -218,7 +218,7 @@ Blockly.PHP.quote_ = function(string) { * Calls any statements following this block. * @param {!Blockly.Block} block The current block. * @param {string} code The PHP code created for this block. - * @param {boolean} opt_thisOnly True to generate code for only this block. + * @param {boolean=} opt_thisOnly True to generate code for only this statement. * @return {string} PHP code with comments and subsequent blocks added. * @private */ @@ -247,7 +247,7 @@ Blockly.PHP.scrub_ = function(block, code, opt_thisOnly) { } } var nextBlock = block.nextConnection && block.nextConnection.targetBlock(); - var nextCode = opt_thisOnly ? "" : Blockly.PHP.blockToCode(nextBlock); + var nextCode = opt_thisOnly ? '' : Blockly.PHP.blockToCode(nextBlock); return commentCode + code + nextCode; }; diff --git a/generators/python.js b/generators/python.js index 65c7a2bae..c3d45b8c1 100644 --- a/generators/python.js +++ b/generators/python.js @@ -244,7 +244,7 @@ Blockly.Python.quote_ = function(string) { * Calls any statements following this block. * @param {!Blockly.Block} block The current block. * @param {string} code The Python code created for this block. - * @param {boolean} opt_thisOnly True to generate code for only this block. + * @param {boolean=} opt_thisOnly True to generate code for only this statement. * @return {string} Python code with comments and subsequent blocks added. * @private */ @@ -278,7 +278,7 @@ Blockly.Python.scrub_ = function(block, code, opt_thisOnly) { } } var nextBlock = block.nextConnection && block.nextConnection.targetBlock(); - var nextCode = opt_thisOnly ? "" : Blockly.Python.blockToCode(nextBlock); + var nextCode = opt_thisOnly ? '' : Blockly.Python.blockToCode(nextBlock); return commentCode + code + nextCode; };