blockly 7.20211209.4 → 8.0.0

package/core/events/events_comment_move.js

@@ -16,7 +16,6 @@
 goog.module('Blockly.Events.CommentMove');
 
 const eventUtils = goog.require('Blockly.Events.utils');
-const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
 const {CommentBase} = goog.require('Blockly.Events.CommentBase');
 const {Coordinate} = goog.require('Blockly.utils.Coordinate');
@@ -26,129 +25,132 @@ const {WorkspaceComment} = goog.requireType('Blockly.WorkspaceComment');
 
 /**
  * Class for a comment move event.  Created before the move.
- * @param {!WorkspaceComment=} opt_comment The comment that is being
- *     moved.  Undefined for a blank event.
  * @extends {CommentBase}
- * @constructor
  * @alias Blockly.Events.CommentMove
  */
-const CommentMove = function(opt_comment) {
-  CommentMove.superClass_.constructor.call(this, opt_comment);
-  if (!opt_comment) {
-    return;  // Blank event to be populated by fromJson.
+class CommentMove extends CommentBase {
+  /**
+   * @param {!WorkspaceComment=} opt_comment The comment that is being
+   *     moved.  Undefined for a blank event.
+   */
+  constructor(opt_comment) {
+    super(opt_comment);
+
+    /**
+     * Type of this event.
+     * @type {string}
+     */
+    this.type = eventUtils.COMMENT_MOVE;
+
+    if (!opt_comment) {
+      return;  // Blank event to be populated by fromJson.
+    }
+
+    /**
+     * The comment that is being moved.  Will be cleared after recording the new
+     * location.
+     * @type {WorkspaceComment}
+     */
+    this.comment_ = opt_comment;
+
+    /**
+     * The location before the move, in workspace coordinates.
+     * @type {!Coordinate}
+     */
+    this.oldCoordinate_ = opt_comment.getXY();
+
+    /**
+     * The location after the move, in workspace coordinates.
+     * @type {Coordinate}
+     */
+    this.newCoordinate_ = null;
   }
 
   /**
-   * The comment that is being moved.  Will be cleared after recording the new
-   * location.
-   * @type {WorkspaceComment}
+   * Record the comment's new location.  Called after the move.  Can only be
+   * called once.
    */
-  this.comment_ = opt_comment;
+  recordNew() {
+    if (!this.comment_) {
+      throw Error(
+          'Tried to record the new position of a comment on the ' +
+          'same event twice.');
+    }
+    this.newCoordinate_ = this.comment_.getXY();
+    this.comment_ = null;
+  }
 
   /**
-   * The location before the move, in workspace coordinates.
-   * @type {!Coordinate}
+   * Override the location before the move.  Use this if you don't create the
+   * event until the end of the move, but you know the original location.
+   * @param {!Coordinate} xy The location before the move,
+   *     in workspace coordinates.
    */
-  this.oldCoordinate_ = opt_comment.getXY();
+  setOldCoordinate(xy) {
+    this.oldCoordinate_ = xy;
+  }
 
+  // TODO (#1266): "Full" and "minimal" serialization.
   /**
-   * The location after the move, in workspace coordinates.
-   * @type {Coordinate}
+   * Encode the event as JSON.
+   * @return {!Object} JSON representation.
    */
-  this.newCoordinate_ = null;
-};
-object.inherits(CommentMove, CommentBase);
-
-/**
- * Record the comment's new location.  Called after the move.  Can only be
- * called once.
- */
-CommentMove.prototype.recordNew = function() {
-  if (!this.comment_) {
-    throw Error(
-        'Tried to record the new position of a comment on the ' +
-        'same event twice.');
+  toJson() {
+    const json = super.toJson();
+    if (this.oldCoordinate_) {
+      json['oldCoordinate'] = Math.round(this.oldCoordinate_.x) + ',' +
+          Math.round(this.oldCoordinate_.y);
+    }
+    if (this.newCoordinate_) {
+      json['newCoordinate'] = Math.round(this.newCoordinate_.x) + ',' +
+          Math.round(this.newCoordinate_.y);
+    }
+    return json;
   }
-  this.newCoordinate_ = this.comment_.getXY();
-  this.comment_ = null;
-};
-
-/**
- * Type of this event.
- * @type {string}
- */
-CommentMove.prototype.type = eventUtils.COMMENT_MOVE;
-
-/**
- * Override the location before the move.  Use this if you don't create the
- * event until the end of the move, but you know the original location.
- * @param {!Coordinate} xy The location before the move,
- *     in workspace coordinates.
- */
-CommentMove.prototype.setOldCoordinate = function(xy) {
-  this.oldCoordinate_ = xy;
-};
 
-/**
- * Encode the event as JSON.
- * @return {!Object} JSON representation.
- */
-// TODO (#1266): "Full" and "minimal" serialization.
-CommentMove.prototype.toJson = function() {
-  const json = CommentMove.superClass_.toJson.call(this);
-  if (this.oldCoordinate_) {
-    json['oldCoordinate'] = Math.round(this.oldCoordinate_.x) + ',' +
-        Math.round(this.oldCoordinate_.y);
-  }
-  if (this.newCoordinate_) {
-    json['newCoordinate'] = Math.round(this.newCoordinate_.x) + ',' +
-        Math.round(this.newCoordinate_.y);
+  /**
+   * Decode the JSON event.
+   * @param {!Object} json JSON representation.
+   */
+  fromJson(json) {
+    super.fromJson(json);
+
+    if (json['oldCoordinate']) {
+      const xy = json['oldCoordinate'].split(',');
+      this.oldCoordinate_ = new Coordinate(Number(xy[0]), Number(xy[1]));
+    }
+    if (json['newCoordinate']) {
+      const xy = json['newCoordinate'].split(',');
+      this.newCoordinate_ = new Coordinate(Number(xy[0]), Number(xy[1]));
+    }
   }
-  return json;
-};
-
-/**
- * Decode the JSON event.
- * @param {!Object} json JSON representation.
- */
-CommentMove.prototype.fromJson = function(json) {
-  CommentMove.superClass_.fromJson.call(this, json);
 
-  if (json['oldCoordinate']) {
-    const xy = json['oldCoordinate'].split(',');
-    this.oldCoordinate_ = new Coordinate(Number(xy[0]), Number(xy[1]));
-  }
-  if (json['newCoordinate']) {
-    const xy = json['newCoordinate'].split(',');
-    this.newCoordinate_ = new Coordinate(Number(xy[0]), Number(xy[1]));
+  /**
+   * Does this event record any change of state?
+   * @return {boolean} False if something changed.
+   */
+  isNull() {
+    return Coordinate.equals(this.oldCoordinate_, this.newCoordinate_);
   }
-};
 
-/**
- * Does this event record any change of state?
- * @return {boolean} False if something changed.
- */
-CommentMove.prototype.isNull = function() {
-  return Coordinate.equals(this.oldCoordinate_, this.newCoordinate_);
-};
-
-/**
- * Run a move event.
- * @param {boolean} forward True if run forward, false if run backward (undo).
- */
-CommentMove.prototype.run = function(forward) {
-  const workspace = this.getEventWorkspace_();
-  const comment = workspace.getCommentById(this.commentId);
-  if (!comment) {
-    console.warn('Can\'t move non-existent comment: ' + this.commentId);
-    return;
+  /**
+   * Run a move event.
+   * @param {boolean} forward True if run forward, false if run backward (undo).
+   */
+  run(forward) {
+    const workspace = this.getEventWorkspace_();
+    const comment = workspace.getCommentById(this.commentId);
+    if (!comment) {
+      console.warn('Can\'t move non-existent comment: ' + this.commentId);
+      return;
+    }
+
+    const target = forward ? this.newCoordinate_ : this.oldCoordinate_;
+    // TODO: Check if the comment is being dragged, and give up if so.
+    const current = comment.getXY();
+    comment.moveBy(target.x - current.x, target.y - current.y);
   }
-
-  const target = forward ? this.newCoordinate_ : this.oldCoordinate_;
-  // TODO: Check if the comment is being dragged, and give up if so.
-  const current = comment.getXY();
-  comment.moveBy(target.x - current.x, target.y - current.y);
-};
+}
 
 registry.register(registry.Type.EVENT, eventUtils.COMMENT_MOVE, CommentMove);
 

package/core/events/events_marker_move.js

@@ -16,7 +16,6 @@
 goog.module('Blockly.Events.MarkerMove');
 
 const eventUtils = goog.require('Blockly.Events.utils');
-const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
 const {ASTNode} = goog.require('Blockly.ASTNode');
 /* eslint-disable-next-line no-unused-vars */
@@ -28,81 +27,83 @@ const {Workspace} = goog.requireType('Blockly.Workspace');
 
 /**
  * Class for a marker move event.
- * @param {?Block=} opt_block The affected block. Null if current node
- *    is of type workspace. Undefined for a blank event.
- * @param {boolean=} isCursor Whether this is a cursor event. Undefined for a
- *    blank event.
- * @param {?ASTNode=} opt_oldNode The old node the marker used to be on.
- *    Undefined for a blank event.
- * @param {!ASTNode=} opt_newNode The new node the marker is now on.
- *    Undefined for a blank event.
  * @extends {UiBase}
- * @constructor
  * @alias Blockly.Events.MarkerMove
  */
-const MarkerMove = function(opt_block, isCursor, opt_oldNode, opt_newNode) {
-  let workspaceId = opt_block ? opt_block.workspace.id : undefined;
-  if (opt_newNode && opt_newNode.getType() === ASTNode.types.WORKSPACE) {
-    workspaceId = (/** @type {!Workspace} */ (opt_newNode.getLocation())).id;
-  }
-  MarkerMove.superClass_.constructor.call(this, workspaceId);
-
+class MarkerMove extends UiBase {
   /**
-   * The workspace identifier for this event.
-   * @type {?string}
+   * @param {?Block=} opt_block The affected block. Null if current node
+   *    is of type workspace. Undefined for a blank event.
+   * @param {boolean=} isCursor Whether this is a cursor event. Undefined for a
+   *    blank event.
+   * @param {?ASTNode=} opt_oldNode The old node the marker used to be on.
+   *    Undefined for a blank event.
+   * @param {!ASTNode=} opt_newNode The new node the marker is now on.
+   *    Undefined for a blank event.
    */
-  this.blockId = opt_block ? opt_block.id : null;
+  constructor(opt_block, isCursor, opt_oldNode, opt_newNode) {
+    let workspaceId = opt_block ? opt_block.workspace.id : undefined;
+    if (opt_newNode && opt_newNode.getType() === ASTNode.types.WORKSPACE) {
+      workspaceId = (/** @type {!Workspace} */ (opt_newNode.getLocation())).id;
+    }
+    super(workspaceId);
 
-  /**
-   * The old node the marker used to be on.
-   * @type {?ASTNode|undefined}
-   */
-  this.oldNode = opt_oldNode;
+    /**
+     * The workspace identifier for this event.
+     * @type {?string}
+     */
+    this.blockId = opt_block ? opt_block.id : null;
+
+    /**
+     * The old node the marker used to be on.
+     * @type {?ASTNode|undefined}
+     */
+    this.oldNode = opt_oldNode;
+
+    /**
+     * The new node the  marker is now on.
+     * @type {ASTNode|undefined}
+     */
+    this.newNode = opt_newNode;
+
+    /**
+     * Whether this is a cursor event.
+     * @type {boolean|undefined}
+     */
+    this.isCursor = isCursor;
+
+    /**
+     * Type of this event.
+     * @type {string}
+     */
+    this.type = eventUtils.MARKER_MOVE;
+  }
 
   /**
-   * The new node the  marker is now on.
-   * @type {ASTNode|undefined}
+   * Encode the event as JSON.
+   * @return {!Object} JSON representation.
    */
-  this.newNode = opt_newNode;
+  toJson() {
+    const json = super.toJson();
+    json['isCursor'] = this.isCursor;
+    json['blockId'] = this.blockId;
+    json['oldNode'] = this.oldNode;
+    json['newNode'] = this.newNode;
+    return json;
+  }
 
   /**
-   * Whether this is a cursor event.
-   * @type {boolean|undefined}
+   * Decode the JSON event.
+   * @param {!Object} json JSON representation.
    */
-  this.isCursor = isCursor;
-};
-object.inherits(MarkerMove, UiBase);
-
-/**
- * Type of this event.
- * @type {string}
- */
-MarkerMove.prototype.type = eventUtils.MARKER_MOVE;
-
-/**
- * Encode the event as JSON.
- * @return {!Object} JSON representation.
- */
-MarkerMove.prototype.toJson = function() {
-  const json = MarkerMove.superClass_.toJson.call(this);
-  json['isCursor'] = this.isCursor;
-  json['blockId'] = this.blockId;
-  json['oldNode'] = this.oldNode;
-  json['newNode'] = this.newNode;
-  return json;
-};
-
-/**
- * Decode the JSON event.
- * @param {!Object} json JSON representation.
- */
-MarkerMove.prototype.fromJson = function(json) {
-  MarkerMove.superClass_.fromJson.call(this, json);
-  this.isCursor = json['isCursor'];
-  this.blockId = json['blockId'];
-  this.oldNode = json['oldNode'];
-  this.newNode = json['newNode'];
-};
+  fromJson(json) {
+    super.fromJson(json);
+    this.isCursor = json['isCursor'];
+    this.blockId = json['blockId'];
+    this.oldNode = json['oldNode'];
+    this.newNode = json['newNode'];
+  }
+}
 
 registry.register(registry.Type.EVENT, eventUtils.MARKER_MOVE, MarkerMove);
 

package/core/events/events_selected.js

@@ -16,66 +16,67 @@
 goog.module('Blockly.Events.Selected');
 
 const eventUtils = goog.require('Blockly.Events.utils');
-const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
 const {UiBase} = goog.require('Blockly.Events.UiBase');
 
 
 /**
  * Class for a selected event.
- * @param {?string=} opt_oldElementId The ID of the previously selected
- *    element. Null if no element last selected. Undefined for a blank event.
- * @param {?string=} opt_newElementId The ID of the selected element. Null if no
- *    element currently selected (deselect). Undefined for a blank event.
- * @param {string=} opt_workspaceId The workspace identifier for this event.
- *    Null if no element previously selected. Undefined for a blank event.
  * @extends {UiBase}
- * @constructor
  * @alias Blockly.Events.Selected
  */
-const Selected = function(opt_oldElementId, opt_newElementId, opt_workspaceId) {
-  Selected.superClass_.constructor.call(this, opt_workspaceId);
-
+class Selected extends UiBase {
   /**
-   * The id of the last selected element.
-   * @type {?string|undefined}
+   * @param {?string=} opt_oldElementId The ID of the previously selected
+   *    element. Null if no element last selected. Undefined for a blank event.
+   * @param {?string=} opt_newElementId The ID of the selected element. Null if
+   *     no element currently selected (deselect). Undefined for a blank event.
+   * @param {string=} opt_workspaceId The workspace identifier for this event.
+   *    Null if no element previously selected. Undefined for a blank event.
    */
-  this.oldElementId = opt_oldElementId;
+  constructor(opt_oldElementId, opt_newElementId, opt_workspaceId) {
+    super(opt_workspaceId);
 
-  /**
-   * The id of the selected element.
-   * @type {?string|undefined}
-   */
-  this.newElementId = opt_newElementId;
-};
-object.inherits(Selected, UiBase);
+    /**
+     * The id of the last selected element.
+     * @type {?string|undefined}
+     */
+    this.oldElementId = opt_oldElementId;
 
-/**
- * Type of this event.
- * @type {string}
- */
-Selected.prototype.type = eventUtils.SELECTED;
+    /**
+     * The id of the selected element.
+     * @type {?string|undefined}
+     */
+    this.newElementId = opt_newElementId;
 
-/**
- * Encode the event as JSON.
- * @return {!Object} JSON representation.
- */
-Selected.prototype.toJson = function() {
-  const json = Selected.superClass_.toJson.call(this);
-  json['oldElementId'] = this.oldElementId;
-  json['newElementId'] = this.newElementId;
-  return json;
-};
+    /**
+     * Type of this event.
+     * @type {string}
+     */
+    this.type = eventUtils.SELECTED;
+  }
 
-/**
- * Decode the JSON event.
- * @param {!Object} json JSON representation.
- */
-Selected.prototype.fromJson = function(json) {
-  Selected.superClass_.fromJson.call(this, json);
-  this.oldElementId = json['oldElementId'];
-  this.newElementId = json['newElementId'];
-};
+  /**
+   * Encode the event as JSON.
+   * @return {!Object} JSON representation.
+   */
+  toJson() {
+    const json = super.toJson();
+    json['oldElementId'] = this.oldElementId;
+    json['newElementId'] = this.newElementId;
+    return json;
+  }
+
+  /**
+   * Decode the JSON event.
+   * @param {!Object} json JSON representation.
+   */
+  fromJson(json) {
+    super.fromJson(json);
+    this.oldElementId = json['oldElementId'];
+    this.newElementId = json['newElementId'];
+  }
+}
 
 registry.register(registry.Type.EVENT, eventUtils.SELECTED, Selected);
 

package/core/events/events_theme_change.js

@@ -16,55 +16,56 @@
 goog.module('Blockly.Events.ThemeChange');
 
 const eventUtils = goog.require('Blockly.Events.utils');
-const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
 const {UiBase} = goog.require('Blockly.Events.UiBase');
 
 
 /**
  * Class for a theme change event.
- * @param {string=} opt_themeName The theme name. Undefined for a blank event.
- * @param {string=} opt_workspaceId The workspace identifier for this event.
- *    event. Undefined for a blank event.
  * @extends {UiBase}
- * @constructor
  * @alias Blockly.Events.ThemeChange
  */
-const ThemeChange = function(opt_themeName, opt_workspaceId) {
-  ThemeChange.superClass_.constructor.call(this, opt_workspaceId);
-
+class ThemeChange extends UiBase {
   /**
-   * The theme name.
-   * @type {string|undefined}
+   * @param {string=} opt_themeName The theme name. Undefined for a blank event.
+   * @param {string=} opt_workspaceId The workspace identifier for this event.
+   *    event. Undefined for a blank event.
    */
-  this.themeName = opt_themeName;
-};
-object.inherits(ThemeChange, UiBase);
+  constructor(opt_themeName, opt_workspaceId) {
+    super(opt_workspaceId);
 
-/**
- * Type of this event.
- * @type {string}
- */
-ThemeChange.prototype.type = eventUtils.THEME_CHANGE;
+    /**
+     * The theme name.
+     * @type {string|undefined}
+     */
+    this.themeName = opt_themeName;
 
-/**
- * Encode the event as JSON.
- * @return {!Object} JSON representation.
- */
-ThemeChange.prototype.toJson = function() {
-  const json = ThemeChange.superClass_.toJson.call(this);
-  json['themeName'] = this.themeName;
-  return json;
-};
+    /**
+     * Type of this event.
+     * @type {string}
+     */
+    this.type = eventUtils.THEME_CHANGE;
+  }
 
-/**
- * Decode the JSON event.
- * @param {!Object} json JSON representation.
- */
-ThemeChange.prototype.fromJson = function(json) {
-  ThemeChange.superClass_.fromJson.call(this, json);
-  this.themeName = json['themeName'];
-};
+  /**
+   * Encode the event as JSON.
+   * @return {!Object} JSON representation.
+   */
+  toJson() {
+    const json = super.toJson();
+    json['themeName'] = this.themeName;
+    return json;
+  }
+
+  /**
+   * Decode the JSON event.
+   * @param {!Object} json JSON representation.
+   */
+  fromJson(json) {
+    super.fromJson(json);
+    this.themeName = json['themeName'];
+  }
+}
 
 registry.register(registry.Type.EVENT, eventUtils.THEME_CHANGE, ThemeChange);