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

Fix variable_map_test and variable_model_test

Browse Source
This commit is contained in:
Rachel Fenichel
2017-12-01 14:05:37 -08:00
parent fa02e56c17
commit 494c4882be
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/xml.js
View File

@@ -87,13 +87,17 @@ Blockly.Xml.blockToDomWithXY = function(block, opt_noId) {
};
Blockly.Xml.fieldToDomVariable_ = function(field, workspace) {
var potentialVariableMap = workspace.isFlyout ?
workspace.targetWorkspace.potentialVariableMap_ : null;
// Ugh that's not true at all.
var id = field.getValue();
var variable = workspace.getVariableById(id);
if (!variable && potentialVariableMap) {
variable = potentialVariableMap.getVariableById(id);
if (!variable) {
if (workspace.isFlyout && workspace.targetWorkspace) {
var potentialVariableMap =
workspace.targetWorkspace.potentialVariableMap_;
if (potentialVariableMap) {
variable = potentialVariableMap.getVariableById(id);
}
}
}
if (variable) {
var container = goog.dom.createDom('field', null, variable.name);