From 10dbf2cc6d99b7bd5c5d99f494b1fad94e183154 Mon Sep 17 00:00:00 2001 From: Neil Fraser Date: Wed, 21 Feb 2018 17:47:01 -0800 Subject: [PATCH] Random typos. @rachel-fenichel LGTMs in person. --- core/names.js | 1 + core/procedures.js | 2 +- core/variables.js | 4 ++-- generators/javascript.js | 4 ++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/core/names.js b/core/names.js index 7b7977290..b76978b62 100644 --- a/core/names.js +++ b/core/names.js @@ -176,6 +176,7 @@ Blockly.Names.prototype.safeName_ = function(name) { } else { // Unfortunately names in non-latin characters will look like // _E9_9F_B3_E4_B9_90 which is pretty meaningless. + // https://github.com/google/blockly/issues/1654 name = encodeURI(name.replace(/ /g, '_')).replace(/[^\w]/g, '_'); // Most languages don't allow names with leading numbers. if ('0123456789'.indexOf(name[0]) != -1) { diff --git a/core/procedures.js b/core/procedures.js index 98ebf41b6..5cafaac45 100644 --- a/core/procedures.js +++ b/core/procedures.js @@ -174,7 +174,7 @@ Blockly.Procedures.rename = function(name) { /** * Construct the blocks required by the flyout for the procedure category. - * @param {!Blockly.Workspace} workspace The workspace contianing procedures. + * @param {!Blockly.Workspace} workspace The workspace containing procedures. * @return {!Array.} Array of XML block elements. */ Blockly.Procedures.flyoutCategory = function(workspace) { diff --git a/core/variables.js b/core/variables.js index 75209df92..2b268b425 100644 --- a/core/variables.js +++ b/core/variables.js @@ -123,7 +123,7 @@ Blockly.Variables.allDeveloperVariables = function(workspace) { /** * Construct the elements (blocks and button) required by the flyout for the * variable category. - * @param {!Blockly.Workspace} workspace The workspace contianing variables. + * @param {!Blockly.Workspace} workspace The workspace containing variables. * @return {!Array.} Array of XML elements. */ Blockly.Variables.flyoutCategory = function(workspace) { @@ -145,7 +145,7 @@ Blockly.Variables.flyoutCategory = function(workspace) { /** * Construct the blocks required by the flyout for the variable category. - * @param {!Blockly.Workspace} workspace The workspace contianing variables. + * @param {!Blockly.Workspace} workspace The workspace containing variables. * @return {!Array.} Array of XML block elements. */ Blockly.Variables.flyoutCategoryBlocks = function(workspace) { diff --git a/generators/javascript.js b/generators/javascript.js index d13ceb359..aa05826c2 100644 --- a/generators/javascript.js +++ b/generators/javascript.js @@ -102,8 +102,8 @@ Blockly.JavaScript.ORDER_LOGICAL_AND = 13; // && Blockly.JavaScript.ORDER_LOGICAL_OR = 14; // || Blockly.JavaScript.ORDER_CONDITIONAL = 15; // ?: Blockly.JavaScript.ORDER_ASSIGNMENT = 16; // = += -= **= *= /= %= <<= >>= ... -Blockly.JavaScript.ORDER_YIELD = 16.5; // yield -Blockly.JavaScript.ORDER_COMMA = 17; // , +Blockly.JavaScript.ORDER_YIELD = 17; // yield +Blockly.JavaScript.ORDER_COMMA = 18; // , Blockly.JavaScript.ORDER_NONE = 99; // (...) /**