Repopulate blocks with ids

This commit is contained in:
DD 2018-02-13 18:09:15 -05:00
parent 31def7d03d
commit 2545d1955d
3 changed files with 33 additions and 1 deletions

View file

@ -1,6 +1,33 @@
const mutationAdapter = require('./mutation-adapter'); const mutationAdapter = require('./mutation-adapter');
const html = require('htmlparser2'); const html = require('htmlparser2');
/**
* (Copied from Blockly.utils)
* Legal characters for the unique ID. Should be all on a US keyboard.
* No characters that conflict with XML or JSON. Requests to remove additional
* 'problematic' characters from this soup will be denied. That's your failure
* to properly escape in your own environment. Issues #251, #625, #682, #1304.
* @private
*/
const genUidSoup_ = '!#$%()*+,-./:;=?@[]^_`{|}~' +
'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789';
/**
* (Copied from Blockly.utils)
* Generate a unique ID. This should be globally unique.
* 87 characters ^ 20 length > 128 bits (better than a UUID).
* @return {string} A globally unique ID string.
*/
const genUid_ = function () {
const length = 20;
const soupLength = genUidSoup_.length;
const id = [];
for (let i = 0; i < length; i++) {
id[i] = genUidSoup_.charAt(Math.random() * soupLength);
}
return id.join('');
};
/** /**
* Convert and an individual block DOM to the representation tree. * Convert and an individual block DOM to the representation tree.
* Based on Blockly's `domToBlockHeadless_`. * Based on Blockly's `domToBlockHeadless_`.
@ -11,6 +38,10 @@ const html = require('htmlparser2');
* @return {undefined} * @return {undefined}
*/ */
const domToBlock = function (blockDOM, blocks, isTopBlock, parent) { const domToBlock = function (blockDOM, blocks, isTopBlock, parent) {
if (!blockDOM.attribs.id) {
blockDOM.attribs.id = genUid_();
}
// Block skeleton. // Block skeleton.
const block = { const block = {
id: blockDOM.attribs.id, // Block ID id: blockDOM.attribs.id, // Block ID

View file

@ -288,7 +288,7 @@ class Blocks {
newCoordinate: e.newCoordinate newCoordinate: e.newCoordinate
}); });
break; break;
case 'drag': case 'dragOutside':
if (optRuntime) { if (optRuntime) {
optRuntime.emitBlockDragUpdate(e.isOutside); optRuntime.emitBlockDragUpdate(e.isOutside);
} }

View file

@ -626,6 +626,7 @@ class VirtualMachine extends EventEmitter {
this._hoveredSpriteId !== this.editingTarget.id) { this._hoveredSpriteId !== this.editingTarget.id) {
const dragTarget = this.runtime.getTargetById(this._hoveredSpriteId); const dragTarget = this.runtime.getTargetById(this._hoveredSpriteId);
if (dragTarget) { if (dragTarget) {
// TODO tell gui to tell blocks to undo, to cause the blocks to move back into place.
const newBlocks = adapter(e); const newBlocks = adapter(e);
for (let i = 0; i < newBlocks.length; i++) { for (let i = 0; i < newBlocks.length; i++) {
dragTarget.blocks.createBlock(newBlocks[i]); dragTarget.blocks.createBlock(newBlocks[i]);