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

Merge pull request #1130 from marisaleung/develop_deserialization_variables_at_top

Browse Source 
Develop deserialization variables at top
This commit is contained in:
marisaleung
2017-05-24 15:35:30 -07:00
committed by GitHub
parent 71066faff6 dc06872a37
commit bebbf8fd39
2 changed files with 175 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
core/xml.js
View File

@@ -349,6 +349,14 @@ Blockly.Xml.domToWorkspace = function(xml, workspace) {
}
} else if (name == 'shadow') {
goog.asserts.fail('Shadow block cannot be a top-level block.');
} else if (name == 'variables') {
if (i == 1) {
Blockly.Xml.domToVariables(xmlChild, workspace);
}
else {
throw Error('\'variables\' tag must be the first element in the' +
'workspace XML, but it was found in another location.');
}
}
}
if (!existingGroup) {
@@ -470,6 +478,25 @@ Blockly.Xml.domToBlock = function(xmlBlock, workspace) {
return topBlock;
};
/**
* Decode an XML list of variables and add the variables to the workspace.
* @param {!Element} xmlVariables List of XML variable elements.
* @param {!Blockly.Workspace} workspace The workspace to which the variable
* should be added.
*/
Blockly.Xml.domToVariables = function(xmlVariables, workspace) {
for (var i = 0, xmlChild; xmlChild = xmlVariables.children[i]; i++) {
var type = xmlChild.getAttribute('type');
var id = xmlChild.getAttribute('id');
var name = xmlChild.textContent;
if (typeof(type) === undefined || type === null) {
throw Error('Variable with id, ' + id + ' is without a type');
}
workspace.createVariable(name, type, id);
}
};
/**
* Decode an XML block tag and create a block (and possibly sub blocks) on the
* workspace.
@@ -551,12 +578,32 @@ Blockly.Xml.domToBlockHeadless_ = function(xmlBlock, workspace) {
// Fall through.
case 'field':
var field = block.getField(name);
var text = xmlChild.textContent;
if (field instanceof Blockly.FieldVariable) {
// TODO (marisaleung): When we change setValue and getValue to
// interact with id's instead of names, update this so that we get
// the variable based on id instead of textContent.
var type = xmlChild.getAttribute('variabletype') || '';
var variable = workspace.getVariable(text);
if (!variable) {
variable = workspace.createVariable(text, type,
xmlChild.getAttribute(id));
}
if (typeof(type) !== undefined && type !== null) {
if (type !== variable.type) {
throw Error('Serialized variable type with id \'' +
variable.getId() + '\' had type ' + variable.type + ', and ' +
'does not match variable field that references it: ' +
Blockly.Xml.domToText(xmlChild) + '.');
}
}
}
if (!field) {
console.warn('Ignoring non-existent field ' + name + ' in block ' +
prototypeName);
break;
}
field.setValue(xmlChild.textContent);
field.setValue(text);
break;
case 'value':
case 'statement':