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

Fix duplicate variable model type (#3594)

Browse Source 
* Resolve duplicate empty var type when returning list of variableModel's types.
This commit is contained in:
Sam El-Husseini
2020-01-14 13:10:34 -08:00
committed by GitHub
parent 4f07776dd9
commit 180926ee77
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/variable_map.js
View File

@@ -28,6 +28,7 @@ goog.require('Blockly.Events.VarDelete');
goog.require('Blockly.Events.VarRename');
goog.require('Blockly.Msg');
goog.require('Blockly.utils');
goog.require('Blockly.utils.object');
/**
@@ -355,11 +356,13 @@ Blockly.VariableMap.prototype.getVariablesOfType = function(type) {
* @package
*/
Blockly.VariableMap.prototype.getVariableTypes = function(ws) {
var potentialTypes = [];
var variableMap = {};
Blockly.utils.object.mixin(variableMap, this.variableMap_);
if (ws && ws.getPotentialVariableMap()) {
potentialTypes = Object.keys(ws.getPotentialVariableMap().variableMap_);
Blockly.utils.object.mixin(variableMap,
ws.getPotentialVariableMap().variableMap_);
}
var types = Object.keys(this.variableMap_).concat(potentialTypes);
var types = Object.keys(variableMap);
var hasEmpty = false;
for (var i = 0; i < types.length; i++) {
if (types[i] == '') {