scratchfoundation/scratch-blocks
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-blocks.git synced 2025-08-28 22:10:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix issue with renameVariable which didn't know about additionalVars. Decide whether or not to use additionalVars based on the new variable isLocal flag.

Browse source
This commit is contained in:
Karishma Chadha 2018-07-12 19:15:49 -04:00
parent 1d7e4bd4e8
commit d9a079d550
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
core/variables.js
View file

@ -289,10 +289,14 @@ Blockly.Variables.createVariable = function(workspace, opt_callback, opt_type) {
// Prompt the user to enter a name for the variable
Blockly.prompt(newMsg, '',
function(text, scope, additionalVars) {
function(text, additionalVars, scope) {
var isLocal = (scope === 'local') || false;
// Default to [] if additionalVars is not provided
additionalVars = additionalVars || [];
var validatedText = validate(text, workspace, additionalVars, opt_callback);
// Only use additionalVars for global variable creation.
var additionalVarNames = isLocal ? [] : additionalVars;
var validatedText = validate(text, workspace, additionalVarNames, opt_callback);
if (validatedText) {
// The name is valid according to the type, create the variable
var potentialVarMap = workspace.getPotentialVariableMap();
@ -467,8 +471,10 @@ Blockly.Variables.renameVariable = function(workspace, variable,
var promptText = promptMsg.replace('%1', variable.name);
Blockly.prompt(promptText, '',
function(newName) {
var validatedText = validate(newName, workspace);
function(newName, additionalVars) {
additionalVars = additionalVars || [];
var additionalVarNames = variable.isLocal ? [] : additionalVars;
var validatedText = validate(newName, workspace, additionalVarNames);
if (validatedText) {
workspace.renameVariableById(variable.getId(), validatedText);
if (opt_callback) {