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 html escaping and flyouts opening

Browse Source
This commit is contained in:
Rachel Fenichel
2017-12-07 16:08:00 -08:00
parent 9d71c972cb
commit 05351569c5
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/block.js
View File

@@ -695,7 +695,12 @@ Blockly.Block.prototype.getVarModels = function() {
for (var i = 0, input; input = this.inputList[i]; i++) {
for (var j = 0, field; field = input.fieldRow[j]; j++) {
if (field instanceof Blockly.FieldVariable) {
vars.push(this.workspace.getVariableById(field.getValue()));
var model = this.workspace.getVariableById(field.getValue());
// Check if the variable actually exists (and isn't just a potential
// variable).
if (model) {
vars.push(model);
}
}
}
}

2
core/variables.js
View File

@@ -336,7 +336,7 @@ Blockly.Variables.generateVariableFieldXml_ = function(variableModel) {
}
var text = '<field name="VAR" id="' + variableModel.getId() +
'" variabletype="' + typeString +
'">' + variableModel.name + '</field>';
'">' + goog.string.htmlEscape(variableModel.name) + '</field>';
return text;
};