CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-09 18:10:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move code from renameVariableInternal to renameVariableById

Browse Source
This commit is contained in:
Rachel Fenichel
2017-12-01 16:22:52 -08:00
parent 3728cfed45
commit 4d76f2948c
1 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
core/workspace.js
View File

@@ -238,13 +238,17 @@ Blockly.Workspace.prototype.updateVariableStore = function(clear) {
/**
* Rename a variable by updating its name in the variable map. Identify the
* variable to rename with the given variable.
* @param {?Blockly.VariableModel} variable Variable to rename.
* variable to rename with the given ID.
* @param {string} id ID of the variable to rename.
* @param {string} newName New variable name.
*/
Blockly.Workspace.prototype.renameVariableInternal_ = function(
variable, newName) {
var type = variable ? variable.type : '';
Blockly.Workspace.prototype.renameVariableById = function(id, newName) {
var variable = this.getVariableById(id);
if (!variable) {
throw new Error('Tried to rename a variable that didn\'t exist. ID: ' + id);
}
var type = variable.type;
var newVariable = this.getVariable(newName, type);
// If a variable previously existed with the new name, we will coalesce the
@@ -264,32 +268,16 @@ Blockly.Workspace.prototype.renameVariableInternal_ = function(
var blocks = this.getAllBlocks();
this.variableMap_.renameVariable(variable, newName, type);
// Iterate through every block and update name.
for (var i = 0; i < blocks.length; i++) {
blocks[i].renameVarById(oldId, newId);
if (oldCase) {
blocks[i].renameVarById(newId, newId);
//blocks[i].renameVar(oldCase, newName);
}
}
Blockly.Events.setGroup(false);
};
/**
* Rename a variable by updating its name in the variable map. Identify the
* variable to rename with the given ID.
* @param {string} id ID of the variable to rename.
* @param {string} newName New variable name.
*/
Blockly.Workspace.prototype.renameVariableById = function(id, newName) {
var variable = this.getVariableById(id);
if (!variable) {
throw new Error('Tried to rename a variable that didn\'t exist. ID: ' + id);
}
this.renameVariableInternal_(variable, newName);
};
/**
* Create a variable with a given name, optional type, and optional ID.
* @param {!string} name The name of the variable. This must be unique across