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

Correctly update variable list when pasting code

Browse source
This commit is contained in:
Rachel Fenichel 2016-07-14 15:39:41 -07:00
parent 97801a0e2f
commit dfe61087f0
2 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
core/workspace.js
View file

@ -202,15 +202,18 @@ Blockly.Workspace.prototype.clear = function() {
/**
* Walk the workspace and update the list of variables to only contain ones in
* use on the workspace. Use when loading new workspaces from disk.
* @param {boolean} clearList True if the old variable list should be cleared.
*/
Blockly.Workspace.prototype.updateVariableList = function() {
Blockly.Workspace.prototype.updateVariableList = function(clearList) {
// TODO: Sort
if (!this.isFlyout) {
// Update the list in place so that the flyout's references stay correct.
this.variableList.length = 0;
var allVariables = Blockly.Variables.allVariables(this);
if (clearList) {
this.variableList.length = 0;
}
var allVariables = Blockly.Variables.allUsedVariables(this);
for (var i = 0; i < allVariables.length; i++) {
this.variableList.push(allVariables[i]);
this.createVariable(allVariables[i]);
}
}
};
@ -241,7 +244,10 @@ Blockly.Workspace.prototype.renameVariable = function(oldName, newName) {
* @param {string} name The new variable's name.
*/
Blockly.Workspace.prototype.createVariable = function(name) {
this.variableList.push(name);
var index = this.variableList.indexOf(name);
if (index == -1) {
this.variableList.push(name);
}
};
/**

2
core/xml.js
View file

@ -314,7 +314,7 @@ Blockly.Xml.domToWorkspace = function(xml, workspace) {
}
Blockly.Field.stopCache();
workspace.updateVariableList();
workspace.updateVariableList(false);
};
/**