Misc cleanup.

This commit is contained in:
Neil Fraser
2016-01-15 15:36:06 -08:00
parent 4b0ed0d372
commit 36fe3994c9
11 changed files with 83 additions and 70 deletions

View File

@@ -44,7 +44,7 @@ Blockly.Xml.workspaceToDom = function(workspace) {
var xml = goog.dom.createDom('xml');
var blocks = workspace.getTopBlocks(true);
for (var i = 0, block; block = blocks[i]; i++) {
var element = Blockly.Xml.blockToDom_(block);
var element = Blockly.Xml.blockToDom(block);
var xy = block.getRelativeToSurfaceXY();
element.setAttribute('x', Math.round(workspace.RTL ? width - xy.x : xy.x));
element.setAttribute('y', Math.round(xy.y));
@@ -57,15 +57,11 @@ Blockly.Xml.workspaceToDom = function(workspace) {
* Encode a block subtree as XML.
* @param {!Blockly.Block} block The root block to encode.
* @return {!Element} Tree of XML elements.
* @private
*/
Blockly.Xml.blockToDom_ = function(block) {
Blockly.Xml.blockToDom = function(block) {
var element = goog.dom.createDom(block.isShadow() ? 'shadow' : 'block');
element.setAttribute('type', block.type);
if (false) {
// Only used by realtime.
element.setAttribute('id', block.id);
}
element.setAttribute('id', block.id);
if (block.mutationToDom) {
// Custom data for an advanced block.
var mutation = block.mutationToDom();
@@ -120,7 +116,7 @@ Blockly.Xml.blockToDom_ = function(block) {
container.appendChild(Blockly.Xml.cloneShadow_(shadow));
}
if (childBlock) {
container.appendChild(Blockly.Xml.blockToDom_(childBlock));
container.appendChild(Blockly.Xml.blockToDom(childBlock));
empty = false;
}
}
@@ -151,7 +147,7 @@ Blockly.Xml.blockToDom_ = function(block) {
var nextBlock = block.getNextBlock();
if (nextBlock) {
var container = goog.dom.createDom('next', null,
Blockly.Xml.blockToDom_(nextBlock));
Blockly.Xml.blockToDom(nextBlock));
element.appendChild(container);
}
var shadow = block.nextConnection && block.nextConnection.getShadowDom();