From 7d63b061bc811d12d02facc89c0b539b5aab34b3 Mon Sep 17 00:00:00 2001 From: Gokula Krishna Date: Tue, 17 Jul 2018 14:34:57 +0800 Subject: [PATCH 1/5] Match docs with code --- core/variables.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/variables.js b/core/variables.js index fe66eafc6..5754be083 100644 --- a/core/variables.js +++ b/core/variables.js @@ -106,8 +106,8 @@ Blockly.Variables.allDeveloperVariables = function(workspace) { var hash = {}; for (var i = 0; i < blocks.length; i++) { var block = blocks[i]; - if (block.getDeveloperVars) { - var devVars = block.getDeveloperVars(); + if (block.getDeveloperVariables) { + var devVars = block.getDeveloperVariables(); for (var j = 0; j < devVars.length; j++) { hash[devVars[j]] = devVars[j]; } From 73340a06e5ce2acef67998ce67d6f116b3c7183e Mon Sep 17 00:00:00 2001 From: Gokula Krishna Date: Tue, 24 Jul 2018 09:54:37 +0800 Subject: [PATCH 2/5] Add backward compatibility support --- core/variables.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/core/variables.js b/core/variables.js index 5754be083..5c37864cc 100644 --- a/core/variables.js +++ b/core/variables.js @@ -106,8 +106,9 @@ Blockly.Variables.allDeveloperVariables = function(workspace) { var hash = {}; for (var i = 0; i < blocks.length; i++) { var block = blocks[i]; - if (block.getDeveloperVariables) { - var devVars = block.getDeveloperVariables(); + var getDeveloperVariables = block.getDeveloperVars || block.getDeveloperVariables; + if (getDeveloperVariables) { + var devVars = getDeveloperVariables(); for (var j = 0; j < devVars.length; j++) { hash[devVars[j]] = devVars[j]; } From 01eccf449ba7365eef0a97221457dcd8ac475194 Mon Sep 17 00:00:00 2001 From: Gokula Krishna Date: Tue, 24 Jul 2018 13:43:18 +0800 Subject: [PATCH 3/5] Prioritize recent key --- core/variables.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/variables.js b/core/variables.js index 5c37864cc..c5cefabfc 100644 --- a/core/variables.js +++ b/core/variables.js @@ -106,7 +106,7 @@ Blockly.Variables.allDeveloperVariables = function(workspace) { var hash = {}; for (var i = 0; i < blocks.length; i++) { var block = blocks[i]; - var getDeveloperVariables = block.getDeveloperVars || block.getDeveloperVariables; + var getDeveloperVariables = block.getDeveloperVariables || block.getDeveloperVars; if (getDeveloperVariables) { var devVars = getDeveloperVariables(); for (var j = 0; j < devVars.length; j++) { From 243116ca986710a3cb0f248362f26bf39d1734a7 Mon Sep 17 00:00:00 2001 From: Andrew n marshall Date: Thu, 23 Aug 2018 15:47:49 -0700 Subject: [PATCH 4/5] Adding warning old function name is detected. --- core/variables.js | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/core/variables.js b/core/variables.js index c5cefabfc..e4d346823 100644 --- a/core/variables.js +++ b/core/variables.js @@ -91,6 +91,12 @@ Blockly.Variables.allUsedVariables = function() { 'issue please file a bug on GitHub.'); }; +/** + * @private + * @type {Object} + */ +Blockly.Variables.ALL_DEVELOPER_VARS_WARNINGS_BY_BLOCK_TYPE_ = {}; + /** * Find all developer variables used by blocks in the workspace. * Developer variables are never shown to the user, but are declared as global @@ -106,7 +112,19 @@ Blockly.Variables.allDeveloperVariables = function(workspace) { var hash = {}; for (var i = 0; i < blocks.length; i++) { var block = blocks[i]; - var getDeveloperVariables = block.getDeveloperVariables || block.getDeveloperVars; + var getDeveloperVariables = block.getDeveloperVariables; + if (!getDeveloperVariables && block.getDeveloperVars) { + // getDeveloperVars was renamed getDeveloperVariables, already + // existing documentation. + getDeveloperVariables = block.getDeveloperVars; + if (!Blockly.Variables.ALL_DEVELOPER_VARS_WARNINGS_BY_BLOCK_TYPE_[ + block.type]) { + console.warn('Function getDeveloperVars() deprecated. Use ' + + 'getDeveloperVariables() (block type \'' + block.type + '\')'); + Blockly.Variables.ALL_DEVELOPER_VARS_WARNINGS_BY_BLOCK_TYPE_[ + block.type] = true; + } + } if (getDeveloperVariables) { var devVars = getDeveloperVariables(); for (var j = 0; j < devVars.length; j++) { From c7c9580c51b5c989acbec253efef14a279ddf0fc Mon Sep 17 00:00:00 2001 From: Andrew n marshall Date: Thu, 23 Aug 2018 16:00:11 -0700 Subject: [PATCH 5/5] Rephrase comment, adding date. --- core/variables.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/variables.js b/core/variables.js index e4d346823..aa8a29fe4 100644 --- a/core/variables.js +++ b/core/variables.js @@ -114,8 +114,8 @@ Blockly.Variables.allDeveloperVariables = function(workspace) { var block = blocks[i]; var getDeveloperVariables = block.getDeveloperVariables; if (!getDeveloperVariables && block.getDeveloperVars) { - // getDeveloperVars was renamed getDeveloperVariables, already - // existing documentation. + // August 2018: getDeveloperVars() was deprecated and renamed + // getDeveloperVariables(). getDeveloperVariables = block.getDeveloperVars; if (!Blockly.Variables.ALL_DEVELOPER_VARS_WARNINGS_BY_BLOCK_TYPE_[ block.type]) {