blockly 7.20211209.4 → 8.0.0

package/core/events/events_block_move.js

@@ -16,7 +16,6 @@
 goog.module('Blockly.Events.BlockMove');
 
 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,168 +26,176 @@ const {Coordinate} = goog.require('Blockly.utils.Coordinate');
 
 /**
  * Class for a block move event.  Created before the move.
- * @param {!Block=} opt_block The moved block.  Undefined for a blank
- *     event.
  * @extends {BlockBase}
- * @constructor
  * @alias Blockly.Events.BlockMove
  */
-const BlockMove = function(opt_block) {
-  BlockMove.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;
-  }
+class BlockMove extends BlockBase {
+  /**
+   * @param {!Block=} opt_block The moved block.  Undefined for a blank
+   *     event.
+   */
+  constructor(opt_block) {
+    super(opt_block);
 
-  const location = this.currentLocation_();
-  this.oldParentId = location.parentId;
-  this.oldInputName = location.inputName;
-  this.oldCoordinate = location.coordinate;
-};
-object.inherits(BlockMove, BlockBase);
+    /**
+     * Type of this event.
+     * @type {string}
+     */
+    this.type = eventUtils.BLOCK_MOVE;
 
-/**
- * Type of this event.
- * @type {string}
- */
-BlockMove.prototype.type = eventUtils.BLOCK_MOVE;
+    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;
+    }
 
-/**
- * Encode the event as JSON.
- * @return {!Object} JSON representation.
- */
-BlockMove.prototype.toJson = function() {
-  const json = BlockMove.superClass_.toJson.call(this);
-  if (this.newParentId) {
-    json['newParentId'] = this.newParentId;
-  }
-  if (this.newInputName) {
-    json['newInputName'] = this.newInputName;
-  }
-  if (this.newCoordinate) {
-    json['newCoordinate'] = Math.round(this.newCoordinate.x) + ',' +
-        Math.round(this.newCoordinate.y);
-  }
-  if (!this.recordUndo) {
-    json['recordUndo'] = this.recordUndo;
-  }
-  return json;
-};
+    const location = this.currentLocation_();
+    this.oldParentId = location.parentId;
+    this.oldInputName = location.inputName;
+    this.oldCoordinate = location.coordinate;
 
-/**
- * Decode the JSON event.
- * @param {!Object} json JSON representation.
- */
-BlockMove.prototype.fromJson = function(json) {
-  BlockMove.superClass_.fromJson.call(this, json);
-  this.newParentId = json['newParentId'];
-  this.newInputName = json['newInputName'];
-  if (json['newCoordinate']) {
-    const xy = json['newCoordinate'].split(',');
-    this.newCoordinate = new Coordinate(Number(xy[0]), Number(xy[1]));
+    this.newParentId = null;
+    this.newInputName = null;
+    this.newCoordinate = null;
   }
-  if (json['recordUndo'] !== undefined) {
-    this.recordUndo = json['recordUndo'];
-  }
-};
 
-/**
- * Record the block's new location.  Called after the move.
- */
-BlockMove.prototype.recordNew = function() {
-  const location = this.currentLocation_();
-  this.newParentId = location.parentId;
-  this.newInputName = location.inputName;
-  this.newCoordinate = location.coordinate;
-};
-
-/**
- * Returns the parentId and input if the block is connected,
- *   or the XY location if disconnected.
- * @return {!Object} Collection of location info.
- * @private
- */
-BlockMove.prototype.currentLocation_ = function() {
-  const workspace = this.getEventWorkspace_();
-  const block = workspace.getBlockById(this.blockId);
-  const location = {};
-  const parent = block.getParent();
-  if (parent) {
-    location.parentId = parent.id;
-    const input = parent.getInputWithBlock(block);
-    if (input) {
-      location.inputName = input.name;
+  /**
+   * Encode the event as JSON.
+   * @return {!Object} JSON representation.
+   */
+  toJson() {
+    const json = super.toJson();
+    if (this.newParentId) {
+      json['newParentId'] = this.newParentId;
+    }
+    if (this.newInputName) {
+      json['newInputName'] = this.newInputName;
+    }
+    if (this.newCoordinate) {
+      json['newCoordinate'] = Math.round(this.newCoordinate.x) + ',' +
+          Math.round(this.newCoordinate.y);
     }
-  } else {
-    location.coordinate = block.getRelativeToSurfaceXY();
+    if (!this.recordUndo) {
+      json['recordUndo'] = this.recordUndo;
+    }
+    return json;
   }
-  return location;
-};
 
-/**
- * Does this event record any change of state?
- * @return {boolean} False if something changed.
- */
-BlockMove.prototype.isNull = function() {
-  return this.oldParentId === this.newParentId &&
-      this.oldInputName === this.newInputName &&
-      Coordinate.equals(this.oldCoordinate, this.newCoordinate);
-};
+  /**
+   * Decode the JSON event.
+   * @param {!Object} json JSON representation.
+   */
+  fromJson(json) {
+    super.fromJson(json);
+    this.newParentId = json['newParentId'];
+    this.newInputName = json['newInputName'];
+    if (json['newCoordinate']) {
+      const xy = json['newCoordinate'].split(',');
+      this.newCoordinate = new Coordinate(Number(xy[0]), Number(xy[1]));
+    }
+    if (json['recordUndo'] !== undefined) {
+      this.recordUndo = json['recordUndo'];
+    }
+  }
 
-/**
- * Run a move event.
- * @param {boolean} forward True if run forward, false if run backward (undo).
- */
-BlockMove.prototype.run = function(forward) {
-  const workspace = this.getEventWorkspace_();
-  const block = workspace.getBlockById(this.blockId);
-  if (!block) {
-    console.warn('Can\'t move non-existent block: ' + this.blockId);
-    return;
+  /**
+   * Record the block's new location.  Called after the move.
+   */
+  recordNew() {
+    const location = this.currentLocation_();
+    this.newParentId = location.parentId;
+    this.newInputName = location.inputName;
+    this.newCoordinate = location.coordinate;
   }
-  const parentId = forward ? this.newParentId : this.oldParentId;
-  const inputName = forward ? this.newInputName : this.oldInputName;
-  const coordinate = forward ? this.newCoordinate : this.oldCoordinate;
-  let parentBlock;
-  if (parentId) {
-    parentBlock = workspace.getBlockById(parentId);
-    if (!parentBlock) {
-      console.warn('Can\'t connect to non-existent block: ' + parentId);
-      return;
+
+  /**
+   * Returns the parentId and input if the block is connected,
+   *   or the XY location if disconnected.
+   * @return {!Object} Collection of location info.
+   * @private
+   */
+  currentLocation_() {
+    const workspace = this.getEventWorkspace_();
+    const block = workspace.getBlockById(this.blockId);
+    const location = {};
+    const parent = block.getParent();
+    if (parent) {
+      location.parentId = parent.id;
+      const input = parent.getInputWithBlock(block);
+      if (input) {
+        location.inputName = input.name;
+      }
+    } else {
+      location.coordinate = block.getRelativeToSurfaceXY();
     }
+    return location;
   }
-  if (block.getParent()) {
-    block.unplug();
+
+  /**
+   * Does this event record any change of state?
+   * @return {boolean} False if something changed.
+   */
+  isNull() {
+    return this.oldParentId === this.newParentId &&
+        this.oldInputName === this.newInputName &&
+        Coordinate.equals(this.oldCoordinate, this.newCoordinate);
   }
-  if (coordinate) {
-    const xy = block.getRelativeToSurfaceXY();
-    block.moveBy(coordinate.x - xy.x, coordinate.y - xy.y);
-  } else {
-    let blockConnection = block.outputConnection;
-    if (!blockConnection ||
-        (block.previousConnection && block.previousConnection.isConnected())) {
-      blockConnection = block.previousConnection;
+
+  /**
+   * Run a move event.
+   * @param {boolean} forward True if run forward, false if run backward (undo).
+   */
+  run(forward) {
+    const workspace = this.getEventWorkspace_();
+    const block = workspace.getBlockById(this.blockId);
+    if (!block) {
+      console.warn('Can\'t move non-existent block: ' + this.blockId);
+      return;
     }
-    let parentConnection;
-    const connectionType = blockConnection.type;
-    if (inputName) {
-      const input = parentBlock.getInput(inputName);
-      if (input) {
-        parentConnection = input.connection;
+    const parentId = forward ? this.newParentId : this.oldParentId;
+    const inputName = forward ? this.newInputName : this.oldInputName;
+    const coordinate = forward ? this.newCoordinate : this.oldCoordinate;
+    let parentBlock;
+    if (parentId) {
+      parentBlock = workspace.getBlockById(parentId);
+      if (!parentBlock) {
+        console.warn('Can\'t connect to non-existent block: ' + parentId);
+        return;
       }
-    } else if (connectionType === ConnectionType.PREVIOUS_STATEMENT) {
-      parentConnection = parentBlock.nextConnection;
     }
-    if (parentConnection) {
-      blockConnection.connect(parentConnection);
+    if (block.getParent()) {
+      block.unplug();
+    }
+    if (coordinate) {
+      const xy = block.getRelativeToSurfaceXY();
+      block.moveBy(coordinate.x - xy.x, coordinate.y - xy.y);
     } else {
-      console.warn('Can\'t connect to non-existent input: ' + inputName);
+      let blockConnection = block.outputConnection;
+      if (!blockConnection ||
+          (block.previousConnection &&
+           block.previousConnection.isConnected())) {
+        blockConnection = block.previousConnection;
+      }
+      let parentConnection;
+      const connectionType = blockConnection.type;
+      if (inputName) {
+        const input = parentBlock.getInput(inputName);
+        if (input) {
+          parentConnection = input.connection;
+        }
+      } else if (connectionType === ConnectionType.PREVIOUS_STATEMENT) {
+        parentConnection = parentBlock.nextConnection;
+      }
+      if (parentConnection) {
+        blockConnection.connect(parentConnection);
+      } else {
+        console.warn('Can\'t connect to non-existent input: ' + inputName);
+      }
     }
   }
-};
+}
 
 registry.register(registry.Type.EVENT, eventUtils.MOVE, BlockMove);
 

package/core/events/events_bubble_open.js

@@ -16,7 +16,6 @@
 goog.module('Blockly.Events.BubbleOpen');
 
 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 {BlockSvg} = goog.requireType('Blockly.BlockSvg');
@@ -25,64 +24,66 @@ const {UiBase} = goog.require('Blockly.Events.UiBase');
 
 /**
  * Class for a bubble open event.
- * @param {BlockSvg} opt_block The associated block. Undefined for a
- *    blank event.
- * @param {boolean=} opt_isOpen Whether the bubble is opening (false if
- *    closing). Undefined for a blank event.
- * @param {string=} opt_bubbleType The type of bubble. One of 'mutator',
- *     'comment'
- *    or 'warning'. Undefined for a blank event.
  * @extends {UiBase}
- * @constructor
  * @alias Blockly.Events.BubbleOpen
  */
-const BubbleOpen = function(opt_block, opt_isOpen, opt_bubbleType) {
-  const workspaceId = opt_block ? opt_block.workspace.id : undefined;
-  BubbleOpen.superClass_.constructor.call(this, workspaceId);
-  this.blockId = opt_block ? opt_block.id : null;
-
+class BubbleOpen extends UiBase {
   /**
-   * Whether the bubble is opening (false if closing).
-   * @type {boolean|undefined}
+   * @param {BlockSvg} opt_block The associated block. Undefined for a
+   *    blank event.
+   * @param {boolean=} opt_isOpen Whether the bubble is opening (false if
+   *    closing). Undefined for a blank event.
+   * @param {string=} opt_bubbleType The type of bubble. One of 'mutator',
+   *     'comment'
+   *    or 'warning'. Undefined for a blank event.
    */
-  this.isOpen = opt_isOpen;
+  constructor(opt_block, opt_isOpen, opt_bubbleType) {
+    const workspaceId = opt_block ? opt_block.workspace.id : undefined;
+    super(workspaceId);
+    this.blockId = opt_block ? opt_block.id : null;
 
-  /**
-   * The type of bubble. One of 'mutator', 'comment', or 'warning'.
-   * @type {string|undefined}
-   */
-  this.bubbleType = opt_bubbleType;
-};
-object.inherits(BubbleOpen, UiBase);
+    /**
+     * Whether the bubble is opening (false if closing).
+     * @type {boolean|undefined}
+     */
+    this.isOpen = opt_isOpen;
 
-/**
- * Type of this event.
- * @type {string}
- */
-BubbleOpen.prototype.type = eventUtils.BUBBLE_OPEN;
+    /**
+     * The type of bubble. One of 'mutator', 'comment', or 'warning'.
+     * @type {string|undefined}
+     */
+    this.bubbleType = opt_bubbleType;
 
-/**
- * Encode the event as JSON.
- * @return {!Object} JSON representation.
- */
-BubbleOpen.prototype.toJson = function() {
-  const json = BubbleOpen.superClass_.toJson.call(this);
-  json['isOpen'] = this.isOpen;
-  json['bubbleType'] = this.bubbleType;
-  json['blockId'] = this.blockId;
-  return json;
-};
+    /**
+     * Type of this event.
+     * @type {string}
+     */
+    this.type = eventUtils.BUBBLE_OPEN;
+  }
 
-/**
- * Decode the JSON event.
- * @param {!Object} json JSON representation.
- */
-BubbleOpen.prototype.fromJson = function(json) {
-  BubbleOpen.superClass_.fromJson.call(this, json);
-  this.isOpen = json['isOpen'];
-  this.bubbleType = json['bubbleType'];
-  this.blockId = json['blockId'];
-};
+  /**
+   * Encode the event as JSON.
+   * @return {!Object} JSON representation.
+   */
+  toJson() {
+    const json = super.toJson();
+    json['isOpen'] = this.isOpen;
+    json['bubbleType'] = this.bubbleType;
+    json['blockId'] = this.blockId;
+    return json;
+  }
+
+  /**
+   * Decode the JSON event.
+   * @param {!Object} json JSON representation.
+   */
+  fromJson(json) {
+    super.fromJson(json);
+    this.isOpen = json['isOpen'];
+    this.bubbleType = json['bubbleType'];
+    this.blockId = json['blockId'];
+  }
+}
 
 registry.register(registry.Type.EVENT, eventUtils.BUBBLE_OPEN, BubbleOpen);
 

package/core/events/events_click.js

@@ -16,7 +16,6 @@
 goog.module('Blockly.Events.Click');
 
 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,58 +24,63 @@ const {UiBase} = goog.require('Blockly.Events.UiBase');
 
 /**
  * Class for a click event.
- * @param {?Block=} opt_block The affected block. Null for click events
- *    that do not have an associated block (i.e. workspace click). Undefined
- *    for a blank event.
- * @param {?string=} opt_workspaceId The workspace identifier for this event.
- *    Not used if block is passed. Undefined for a blank event.
- * @param {string=} opt_targetType The type of element targeted by this click
- *    event. Undefined for a blank event.
  * @extends {UiBase}
- * @constructor
  * @alias Blockly.Events.Click
  */
-const Click = function(opt_block, opt_workspaceId, opt_targetType) {
-  const workspaceId = opt_block ? opt_block.workspace.id : opt_workspaceId;
-  Click.superClass_.constructor.call(this, workspaceId);
-  this.blockId = opt_block ? opt_block.id : null;
-
+class Click extends UiBase {
   /**
-   * The type of element targeted by this click event.
-   * @type {string|undefined}
+   * @param {?Block=} opt_block The affected block. Null for click events
+   *    that do not have an associated block (i.e. workspace click). Undefined
+   *    for a blank event.
+   * @param {?string=} opt_workspaceId The workspace identifier for this event.
+   *    Not used if block is passed. Undefined for a blank event.
+   * @param {string=} opt_targetType The type of element targeted by this click
+   *    event. Undefined for a blank event.
    */
-  this.targetType = opt_targetType;
-};
-object.inherits(Click, UiBase);
+  constructor(opt_block, opt_workspaceId, opt_targetType) {
+    let workspaceId = opt_block ? opt_block.workspace.id : opt_workspaceId;
+    if (workspaceId === null) {
+      workspaceId = undefined;
+    }
+    super(workspaceId);
+    this.blockId = opt_block ? opt_block.id : null;
 
-/**
- * Type of this event.
- * @type {string}
- */
-Click.prototype.type = eventUtils.CLICK;
+    /**
+     * The type of element targeted by this click event.
+     * @type {string|undefined}
+     */
+    this.targetType = opt_targetType;
 
-/**
- * Encode the event as JSON.
- * @return {!Object} JSON representation.
- */
-Click.prototype.toJson = function() {
-  const json = Click.superClass_.toJson.call(this);
-  json['targetType'] = this.targetType;
-  if (this.blockId) {
-    json['blockId'] = this.blockId;
+    /**
+     * Type of this event.
+     * @type {string}
+     */
+    this.type = eventUtils.CLICK;
   }
-  return json;
-};
 
-/**
- * Decode the JSON event.
- * @param {!Object} json JSON representation.
- */
-Click.prototype.fromJson = function(json) {
-  Click.superClass_.fromJson.call(this, json);
-  this.targetType = json['targetType'];
-  this.blockId = json['blockId'];
-};
+  /**
+   * Encode the event as JSON.
+   * @return {!Object} JSON representation.
+   */
+  toJson() {
+    const json = super.toJson();
+    json['targetType'] = this.targetType;
+    if (this.blockId) {
+      json['blockId'] = this.blockId;
+    }
+    return json;
+  }
+
+  /**
+   * Decode the JSON event.
+   * @param {!Object} json JSON representation.
+   */
+  fromJson(json) {
+    super.fromJson(json);
+    this.targetType = json['targetType'];
+    this.blockId = json['blockId'];
+  }
+}
 
 registry.register(registry.Type.EVENT, eventUtils.CLICK, Click);