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

Merge pull request #2425 from BeksOmega/fixes/fromXml

Browse Source 
Removed Explicitly Setting Variable Type to Two Single Quotes
This commit is contained in:
Rachel Fenichel
2019-05-01 15:42:10 -07:00
committed by GitHub
parent 5983c3c4b7 3afcd23535
commit 5e56b4ad58
2 changed files with 132 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/variables.js
View File

@@ -466,9 +466,6 @@ Blockly.Variables.generateVariableFieldXmlString = function(variableModel) {
// The variable name may be user input, so it may contain characters that
// need to be escaped to create valid XML.
var typeString = variableModel.type;
if (typeString == '') {
typeString = '\'\'';
}
var text = '<field name="VAR" id="' + variableModel.getId() +
'" variabletype="' + goog.string.htmlEscape(typeString) +
'">' + goog.string.htmlEscape(variableModel.name) + '</field>';

132
tests/mocha/xml_test.js
View File

@@ -287,6 +287,138 @@ suite('XML', function() {
});
});
suite('Deserialization', function() {
suite('Dynamic Category Blocks', function() {
test('Untyped Variables', function() {
Blockly.defineBlocksWithJsonArray([{
"type": "variables_get",
"message0": "%1",
"args0": [
{
"type": "field_variable",
"name": "VAR",
}
]
},
{
"type": "variables_set",
"message0": "%1 %2",
"args0": [
{
"type": "field_variable",
"name": "VAR"
},
{
"type": "input_value",
"name": "VALUE"
}
]
},
{
"type": "math_change",
"message0": "%1 %2",
"args0": [
{
"type": "field_variable",
"name": "VAR",
},
{
"type": "input_value",
"name": "DELTA",
"check": "Number"
}
]
},
{
"type": "math_number",
"message0": "%1",
"args0": [{
"type": "field_number",
"name": "NUM",
"value": 0
}],
"output": "Number"
}]);
this.workspace.createVariable('name1', '', 'id1');
var blocksArray = Blockly.Variables.flyoutCategoryBlocks(this.workspace);
try {
for (var i = 0, xml; xml = blocksArray[i]; i++) {
Blockly.Xml.domToBlock(xml, this.workspace);
}
} finally {
delete Blockly.Blocks['variables_get'];
delete Blockly.Blocks['variables_set'];
delete Blockly.Blocks['math_change'];
delete Blockly.Blocks['math_number'];
}
});
test('Typed Variables', function() {
Blockly.defineBlocksWithJsonArray([{
"type": "variables_get",
"message0": "%1",
"args0": [
{
"type": "field_variable",
"name": "VAR",
}
]
},
{
"type": "variables_set",
"message0": "%1 %2",
"args0": [
{
"type": "field_variable",
"name": "VAR"
},
{
"type": "input_value",
"name": "VALUE"
}
]
},
{
"type": "math_change",
"message0": "%1 %2",
"args0": [
{
"type": "field_variable",
"name": "VAR",
},
{
"type": "input_value",
"name": "DELTA",
"check": "Number"
}
]
},
{
"type": "math_number",
"message0": "%1",
"args0": [{
"type": "field_number",
"name": "NUM",
"value": 0
}],
"output": "Number"
}]);
this.workspace.createVariable('name1', 'String', 'id1');
this.workspace.createVariable('name2', 'Number', 'id2');
this.workspace.createVariable('name3', 'Colour', 'id3');
var blocksArray = Blockly.VariablesDynamic
.flyoutCategoryBlocks(this.workspace);
try {
for (var i = 0, xml; xml = blocksArray[i]; i++) {
Blockly.Xml.domToBlock(xml, this.workspace);
}
} finally {
delete Blockly.Blocks['variables_get'];
delete Blockly.Blocks['variables_set'];
delete Blockly.Blocks['math_change'];
delete Blockly.Blocks['math_number'];
}
});
});
});
});