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

Removed textToDom Needing <xml> Documents (#2585)

Browse Source 
* Removed textToDom needing <xml> documents.

* Fixed jsdoc.

* Followon changes resulting from lack of XML tag.

* Fix Mocha test.
This commit is contained in:
Beka Westberg
2019-06-24 15:50:06 -07:00
committed by RoboErikG
parent 27a6593d27
commit 5a4cc7ae12
7 changed files with 36 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
core/variables.js
View File

@@ -175,39 +175,33 @@ Blockly.Variables.flyoutCategoryBlocks = function(workspace) {
variableModelList[variableModelList.length - 1]);
if (Blockly.Blocks['variables_set']) {
var gap = Blockly.Blocks['math_change'] ? 8 : 24;
var blockText = '<xml>' +
'<block type="variables_set" gap="' + gap + '">' +
var blockText = '<block type="variables_set" gap="' + gap + '">' +
mostRecentVariableFieldXmlString +
'</block>' +
'</xml>';
var block = Blockly.Xml.textToDom(blockText).firstChild;
'</block>';
var block = Blockly.Xml.textToDom(blockText);
xmlList.push(block);
}
if (Blockly.Blocks['math_change']) {
var gap = Blockly.Blocks['variables_get'] ? 20 : 8;
var blockText = '<xml>' +
'<block type="math_change" gap="' + gap + '">' +
var blockText = '<block type="math_change" gap="' + gap + '">' +
mostRecentVariableFieldXmlString +
'<value name="DELTA">' +
'<shadow type="math_number">' +
'<field name="NUM">1</field>' +
'</shadow>' +
'</value>' +
'</block>' +
'</xml>';
var block = Blockly.Xml.textToDom(blockText).firstChild;
'</block>';
var block = Blockly.Xml.textToDom(blockText);
xmlList.push(block);
}
if (Blockly.Blocks['variables_get']) {
variableModelList.sort(Blockly.VariableModel.compareByName);
for (var i = 0, variable; variable = variableModelList[i]; i++) {
var blockText = '<xml>' +
'<block type="variables_get" gap="8">' +
var blockText = '<block type="variables_get" gap="8">' +
Blockly.Variables.generateVariableFieldXmlString(variable) +
'</block>' +
'</xml>';
var block = Blockly.Xml.textToDom(blockText).firstChild;
'</block>';
var block = Blockly.Xml.textToDom(blockText);
xmlList.push(block);
}
}
@@ -481,10 +475,7 @@ Blockly.Variables.generateVariableFieldXmlString = function(variableModel) {
Blockly.Variables.generateVariableFieldDom = function(variableModel) {
var xmlFieldString =
Blockly.Variables.generateVariableFieldXmlString(variableModel);
var text = '<xml>' + xmlFieldString + '</xml>';
var dom = Blockly.Xml.textToDom(text);
var fieldDom = dom.firstChild;
return fieldDom;
return Blockly.Xml.textToDom(xmlFieldString);
};
/**