blockly 7.20211209.4 → 8.0.1

package/core/events/events_block_create.js

@@ -18,7 +18,6 @@ goog.module('Blockly.Events.BlockCreate');
 const Xml = goog.require('Blockly.Xml');
 const blocks = goog.require('Blockly.serialization.blocks');
 const eventUtils = goog.require('Blockly.Events.utils');
-const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
 const {BlockBase} = goog.require('Blockly.Events.BlockBase');
 /* eslint-disable-next-line no-unused-vars */
@@ -27,90 +26,93 @@ const {Block} = goog.requireType('Blockly.Block');
 
 /**
  * Class for a block creation event.
- * @param {!Block=} opt_block The created block.  Undefined for a blank
- *     event.
  * @extends {BlockBase}
- * @constructor
  * @alias Blockly.Events.BlockCreate
  */
-const BlockCreate = function(opt_block) {
-  BlockCreate.superClass_.constructor.call(this, opt_block);
-  if (!opt_block) {
-    return;  // Blank event to be populated by fromJson.
-  }
-  if (opt_block.isShadow()) {
-    // Moving shadow blocks is handled via disconnection.
-    this.recordUndo = false;
-  }
-
-  this.xml = Xml.blockToDomWithXY(opt_block);
-  this.ids = eventUtils.getDescendantIds(opt_block);
-
+class BlockCreate extends BlockBase {
   /**
-   * JSON representation of the block that was just created.
-   * @type {!blocks.State}
+   * @param {!Block=} opt_block The created block.  Undefined for a blank
+   *     event.
    */
-  this.json = /** @type {!blocks.State} */ (
-      blocks.save(opt_block, {addCoordinates: true}));
-};
-object.inherits(BlockCreate, BlockBase);
+  constructor(opt_block) {
+    super(opt_block);
 
-/**
- * Type of this event.
- * @type {string}
- */
-BlockCreate.prototype.type = eventUtils.BLOCK_CREATE;
+    /**
+     * Type of this event.
+     * @type {string}
+     */
+    this.type = eventUtils.BLOCK_CREATE;
 
-/**
- * Encode the event as JSON.
- * @return {!Object} JSON representation.
- */
-BlockCreate.prototype.toJson = function() {
-  const json = BlockCreate.superClass_.toJson.call(this);
-  json['xml'] = Xml.domToText(this.xml);
-  json['ids'] = this.ids;
-  json['json'] = this.json;
-  if (!this.recordUndo) {
-    json['recordUndo'] = this.recordUndo;
+    if (!opt_block) {
+      return;  // Blank event to be populated by fromJson.
+    }
+    if (opt_block.isShadow()) {
+      // Moving shadow blocks is handled via disconnection.
+      this.recordUndo = false;
+    }
+
+    this.xml = Xml.blockToDomWithXY(opt_block);
+    this.ids = eventUtils.getDescendantIds(opt_block);
+
+    /**
+     * JSON representation of the block that was just created.
+     * @type {!blocks.State}
+     */
+    this.json = /** @type {!blocks.State} */ (
+        blocks.save(opt_block, {addCoordinates: true}));
   }
-  return json;
-};
 
-/**
- * Decode the JSON event.
- * @param {!Object} json JSON representation.
- */
-BlockCreate.prototype.fromJson = function(json) {
-  BlockCreate.superClass_.fromJson.call(this, json);
-  this.xml = Xml.textToDom(json['xml']);
-  this.ids = json['ids'];
-  this.json = /** @type {!blocks.State} */ (json['json']);
-  if (json['recordUndo'] !== undefined) {
-    this.recordUndo = json['recordUndo'];
+  /**
+   * Encode the event as JSON.
+   * @return {!Object} JSON representation.
+   */
+  toJson() {
+    const json = super.toJson();
+    json['xml'] = Xml.domToText(this.xml);
+    json['ids'] = this.ids;
+    json['json'] = this.json;
+    if (!this.recordUndo) {
+      json['recordUndo'] = this.recordUndo;
+    }
+    return json;
   }
-};
 
-/**
- * Run a creation event.
- * @param {boolean} forward True if run forward, false if run backward (undo).
- */
-BlockCreate.prototype.run = function(forward) {
-  const workspace = this.getEventWorkspace_();
-  if (forward) {
-    blocks.append(this.json, workspace);
-  } else {
-    for (let i = 0; i < this.ids.length; i++) {
-      const id = this.ids[i];
-      const block = workspace.getBlockById(id);
-      if (block) {
-        block.dispose(false);
-      } else if (id === this.blockId) {
-        // Only complain about root-level block.
-        console.warn('Can\'t uncreate non-existent block: ' + id);
+  /**
+   * Decode the JSON event.
+   * @param {!Object} json JSON representation.
+   */
+  fromJson(json) {
+    super.fromJson(json);
+    this.xml = Xml.textToDom(json['xml']);
+    this.ids = json['ids'];
+    this.json = /** @type {!blocks.State} */ (json['json']);
+    if (json['recordUndo'] !== undefined) {
+      this.recordUndo = json['recordUndo'];
+    }
+  }
+
+  /**
+   * Run a creation event.
+   * @param {boolean} forward True if run forward, false if run backward (undo).
+   */
+  run(forward) {
+    const workspace = this.getEventWorkspace_();
+    if (forward) {
+      blocks.append(this.json, workspace);
+    } else {
+      for (let i = 0; i < this.ids.length; i++) {
+        const id = this.ids[i];
+        const block = workspace.getBlockById(id);
+        if (block) {
+          block.dispose(false);
+        } else if (id === this.blockId) {
+          // Only complain about root-level block.
+          console.warn('Can\'t uncreate non-existent block: ' + id);
+        }
       }
     }
   }
-};
+}
 
 registry.register(registry.Type.EVENT, eventUtils.CREATE, BlockCreate);
 

package/core/events/events_block_delete.js

@@ -18,7 +18,6 @@ goog.module('Blockly.Events.BlockDelete');
 const Xml = goog.require('Blockly.Xml');
 const blocks = goog.require('Blockly.serialization.blocks');
 const eventUtils = goog.require('Blockly.Events.utils');
-const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
 const {BlockBase} = goog.require('Blockly.Events.BlockBase');
 /* eslint-disable-next-line no-unused-vars */
@@ -27,102 +26,105 @@ const {Block} = goog.requireType('Blockly.Block');
 
 /**
  * Class for a block deletion event.
- * @param {!Block=} opt_block The deleted block.  Undefined for a blank
- *     event.
  * @extends {BlockBase}
- * @constructor
  * @alias Blockly.Events.BlockDelete
  */
-const BlockDelete = function(opt_block) {
-  BlockDelete.superClass_.constructor.call(this, opt_block);
-  if (!opt_block) {
-    return;  // Blank event to be populated by fromJson.
-  }
-  if (opt_block.getParent()) {
-    throw Error('Connected blocks cannot be deleted.');
-  }
-  if (opt_block.isShadow()) {
-    // Respawning shadow blocks is handled via disconnection.
-    this.recordUndo = false;
-  }
-
-  this.oldXml = Xml.blockToDomWithXY(opt_block);
-  this.ids = eventUtils.getDescendantIds(opt_block);
-
+class BlockDelete extends BlockBase {
   /**
-   * Was the block that was just deleted a shadow?
-   * @type {boolean}
+   * @param {!Block=} opt_block The deleted block.  Undefined for a blank
+   *     event.
    */
-  this.wasShadow = opt_block.isShadow();
+  constructor(opt_block) {
+    super(opt_block);
 
-  /**
-   * JSON representation of the block that was just deleted.
-   * @type {!blocks.State}
-   */
-  this.oldJson = /** @type {!blocks.State} */ (
-      blocks.save(opt_block, {addCoordinates: true}));
-};
-object.inherits(BlockDelete, BlockBase);
+    /**
+     * Type of this event.
+     * @type {string}
+     */
+    this.type = eventUtils.BLOCK_DELETE;
 
-/**
- * Type of this event.
- * @type {string}
- */
-BlockDelete.prototype.type = eventUtils.BLOCK_DELETE;
+    if (!opt_block) {
+      return;  // Blank event to be populated by fromJson.
+    }
+    if (opt_block.getParent()) {
+      throw Error('Connected blocks cannot be deleted.');
+    }
+    if (opt_block.isShadow()) {
+      // Respawning shadow blocks is handled via disconnection.
+      this.recordUndo = false;
+    }
 
-/**
- * Encode the event as JSON.
- * @return {!Object} JSON representation.
- */
-BlockDelete.prototype.toJson = function() {
-  const json = BlockDelete.superClass_.toJson.call(this);
-  json['oldXml'] = Xml.domToText(this.oldXml);
-  json['ids'] = this.ids;
-  json['wasShadow'] = this.wasShadow;
-  json['oldJson'] = this.oldJson;
-  if (!this.recordUndo) {
-    json['recordUndo'] = this.recordUndo;
+    this.oldXml = Xml.blockToDomWithXY(opt_block);
+    this.ids = eventUtils.getDescendantIds(opt_block);
+
+    /**
+     * Was the block that was just deleted a shadow?
+     * @type {boolean}
+     */
+    this.wasShadow = opt_block.isShadow();
+
+    /**
+     * JSON representation of the block that was just deleted.
+     * @type {!blocks.State}
+     */
+    this.oldJson = /** @type {!blocks.State} */ (
+        blocks.save(opt_block, {addCoordinates: true}));
   }
-  return json;
-};
 
-/**
- * Decode the JSON event.
- * @param {!Object} json JSON representation.
- */
-BlockDelete.prototype.fromJson = function(json) {
-  BlockDelete.superClass_.fromJson.call(this, json);
-  this.oldXml = Xml.textToDom(json['oldXml']);
-  this.ids = json['ids'];
-  this.wasShadow =
-      json['wasShadow'] || this.oldXml.tagName.toLowerCase() === 'shadow';
-  this.oldJson = /** @type {!blocks.State} */ (json['oldJson']);
-  if (json['recordUndo'] !== undefined) {
-    this.recordUndo = json['recordUndo'];
+  /**
+   * Encode the event as JSON.
+   * @return {!Object} JSON representation.
+   */
+  toJson() {
+    const json = super.toJson();
+    json['oldXml'] = Xml.domToText(this.oldXml);
+    json['ids'] = this.ids;
+    json['wasShadow'] = this.wasShadow;
+    json['oldJson'] = this.oldJson;
+    if (!this.recordUndo) {
+      json['recordUndo'] = this.recordUndo;
+    }
+    return json;
   }
-};
 
-/**
- * Run a deletion event.
- * @param {boolean} forward True if run forward, false if run backward (undo).
- */
-BlockDelete.prototype.run = function(forward) {
-  const workspace = this.getEventWorkspace_();
-  if (forward) {
-    for (let i = 0; i < this.ids.length; i++) {
-      const id = this.ids[i];
-      const block = workspace.getBlockById(id);
-      if (block) {
-        block.dispose(false);
-      } else if (id === this.blockId) {
-        // Only complain about root-level block.
-        console.warn('Can\'t delete non-existent block: ' + id);
+  /**
+   * Decode the JSON event.
+   * @param {!Object} json JSON representation.
+   */
+  fromJson(json) {
+    super.fromJson(json);
+    this.oldXml = Xml.textToDom(json['oldXml']);
+    this.ids = json['ids'];
+    this.wasShadow =
+        json['wasShadow'] || this.oldXml.tagName.toLowerCase() === 'shadow';
+    this.oldJson = /** @type {!blocks.State} */ (json['oldJson']);
+    if (json['recordUndo'] !== undefined) {
+      this.recordUndo = json['recordUndo'];
+    }
+  }
+
+  /**
+   * Run a deletion event.
+   * @param {boolean} forward True if run forward, false if run backward (undo).
+   */
+  run(forward) {
+    const workspace = this.getEventWorkspace_();
+    if (forward) {
+      for (let i = 0; i < this.ids.length; i++) {
+        const id = this.ids[i];
+        const block = workspace.getBlockById(id);
+        if (block) {
+          block.dispose(false);
+        } else if (id === this.blockId) {
+          // Only complain about root-level block.
+          console.warn('Can\'t delete non-existent block: ' + id);
+        }
       }
+    } else {
+      blocks.append(this.oldJson, workspace);
     }
-  } else {
-    blocks.append(this.oldJson, workspace);
   }
-};
+}
 
 registry.register(registry.Type.EVENT, eventUtils.DELETE, BlockDelete);
 

package/core/events/events_block_drag.js

@@ -16,7 +16,6 @@
 goog.module('Blockly.Events.BlockDrag');
 
 const eventUtils = goog.require('Blockly.Events.utils');
-const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
 /* eslint-disable-next-line no-unused-vars */
 const {Block} = goog.requireType('Blockly.Block');
@@ -25,63 +24,65 @@ const {UiBase} = goog.require('Blockly.Events.UiBase');
 
 /**
  * Class for a block drag event.
- * @param {!Block=} opt_block The top block in the stack that is being
- *    dragged. Undefined for a blank event.
- * @param {boolean=} opt_isStart Whether this is the start of a block drag.
- *    Undefined for a blank event.
- * @param {!Array<!Block>=} opt_blocks The blocks affected by this
- *    drag. Undefined for a blank event.
  * @extends {UiBase}
- * @constructor
  * @alias Blockly.Events.BlockDrag
  */
-const BlockDrag = function(opt_block, opt_isStart, opt_blocks) {
-  const workspaceId = opt_block ? opt_block.workspace.id : undefined;
-  BlockDrag.superClass_.constructor.call(this, workspaceId);
-  this.blockId = opt_block ? opt_block.id : null;
-
+class BlockDrag extends UiBase {
   /**
-   * Whether this is the start of a block drag.
-   * @type {boolean|undefined}
+   * @param {!Block=} opt_block The top block in the stack that is being
+   *    dragged. Undefined for a blank event.
+   * @param {boolean=} opt_isStart Whether this is the start of a block drag.
+   *    Undefined for a blank event.
+   * @param {!Array<!Block>=} opt_blocks The blocks affected by this
+   *    drag. Undefined for a blank event.
    */
-  this.isStart = opt_isStart;
+  constructor(opt_block, opt_isStart, opt_blocks) {
+    const workspaceId = opt_block ? opt_block.workspace.id : undefined;
+    super(workspaceId);
+    this.blockId = opt_block ? opt_block.id : null;
 
-  /**
-   * The blocks affected by this drag event.
-   * @type {!Array<!Block>|undefined}
-   */
-  this.blocks = opt_blocks;
-};
-object.inherits(BlockDrag, UiBase);
+    /**
+     * Whether this is the start of a block drag.
+     * @type {boolean|undefined}
+     */
+    this.isStart = opt_isStart;
 
-/**
- * Type of this event.
- * @type {string}
- */
-BlockDrag.prototype.type = eventUtils.BLOCK_DRAG;
+    /**
+     * The blocks affected by this drag event.
+     * @type {!Array<!Block>|undefined}
+     */
+    this.blocks = opt_blocks;
 
-/**
- * Encode the event as JSON.
- * @return {!Object} JSON representation.
- */
-BlockDrag.prototype.toJson = function() {
-  const json = BlockDrag.superClass_.toJson.call(this);
-  json['isStart'] = this.isStart;
-  json['blockId'] = this.blockId;
-  json['blocks'] = this.blocks;
-  return json;
-};
+    /**
+     * Type of this event.
+     * @type {string}
+     */
+    this.type = eventUtils.BLOCK_DRAG;
+  }
 
-/**
- * Decode the JSON event.
- * @param {!Object} json JSON representation.
- */
-BlockDrag.prototype.fromJson = function(json) {
-  BlockDrag.superClass_.fromJson.call(this, json);
-  this.isStart = json['isStart'];
-  this.blockId = json['blockId'];
-  this.blocks = json['blocks'];
-};
+  /**
+   * Encode the event as JSON.
+   * @return {!Object} JSON representation.
+   */
+  toJson() {
+    const json = super.toJson();
+    json['isStart'] = this.isStart;
+    json['blockId'] = this.blockId;
+    json['blocks'] = this.blocks;
+    return json;
+  }
+
+  /**
+   * Decode the JSON event.
+   * @param {!Object} json JSON representation.
+   */
+  fromJson(json) {
+    super.fromJson(json);
+    this.isStart = json['isStart'];
+    this.blockId = json['blockId'];
+    this.blocks = json['blocks'];
+  }
+}
 
 registry.register(registry.Type.EVENT, eventUtils.BLOCK_DRAG, BlockDrag);