blockly 7.20211209.2 → 8.0.0

package/core/events/events_toolbox_item_select.js

@@ -16,66 +16,67 @@
 goog.module('Blockly.Events.ToolboxItemSelect');
 
 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 toolbox item select event.
- * @param {?string=} opt_oldItem The previously selected toolbox item. Undefined
- *    for a blank event.
- * @param {?string=} opt_newItem The newly selected toolbox item. Undefined for
- *    a blank event.
- * @param {string=} opt_workspaceId The workspace identifier for this event.
- *    Undefined for a blank event.
  * @extends {UiBase}
- * @constructor
  * @alias Blockly.Events.ToolboxItemSelect
  */
-const ToolboxItemSelect = function(opt_oldItem, opt_newItem, opt_workspaceId) {
-  ToolboxItemSelect.superClass_.constructor.call(this, opt_workspaceId);
-
+class ToolboxItemSelect extends UiBase {
   /**
-   * The previously selected toolbox item.
-   * @type {?string|undefined}
+   * @param {?string=} opt_oldItem The previously selected toolbox item.
+   *     Undefined for a blank event.
+   * @param {?string=} opt_newItem The newly selected toolbox item. Undefined
+   *     for a blank event.
+   * @param {string=} opt_workspaceId The workspace identifier for this event.
+   *    Undefined for a blank event.
    */
-  this.oldItem = opt_oldItem;
+  constructor(opt_oldItem, opt_newItem, opt_workspaceId) {
+    super(opt_workspaceId);
 
-  /**
-   * The newly selected toolbox item.
-   * @type {?string|undefined}
-   */
-  this.newItem = opt_newItem;
-};
-object.inherits(ToolboxItemSelect, UiBase);
+    /**
+     * The previously selected toolbox item.
+     * @type {?string|undefined}
+     */
+    this.oldItem = opt_oldItem;
 
-/**
- * Type of this event.
- * @type {string}
- */
-ToolboxItemSelect.prototype.type = eventUtils.TOOLBOX_ITEM_SELECT;
+    /**
+     * The newly selected toolbox item.
+     * @type {?string|undefined}
+     */
+    this.newItem = opt_newItem;
 
-/**
- * Encode the event as JSON.
- * @return {!Object} JSON representation.
- */
-ToolboxItemSelect.prototype.toJson = function() {
-  const json = ToolboxItemSelect.superClass_.toJson.call(this);
-  json['oldItem'] = this.oldItem;
-  json['newItem'] = this.newItem;
-  return json;
-};
+    /**
+     * Type of this event.
+     * @type {string}
+     */
+    this.type = eventUtils.TOOLBOX_ITEM_SELECT;
+  }
 
-/**
- * Decode the JSON event.
- * @param {!Object} json JSON representation.
- */
-ToolboxItemSelect.prototype.fromJson = function(json) {
-  ToolboxItemSelect.superClass_.fromJson.call(this, json);
-  this.oldItem = json['oldItem'];
-  this.newItem = json['newItem'];
-};
+  /**
+   * Encode the event as JSON.
+   * @return {!Object} JSON representation.
+   */
+  toJson() {
+    const json = super.toJson();
+    json['oldItem'] = this.oldItem;
+    json['newItem'] = this.newItem;
+    return json;
+  }
+
+  /**
+   * Decode the JSON event.
+   * @param {!Object} json JSON representation.
+   */
+  fromJson(json) {
+    super.fromJson(json);
+    this.oldItem = json['oldItem'];
+    this.newItem = json['newItem'];
+  }
+}
 
 registry.register(
     registry.Type.EVENT, eventUtils.TOOLBOX_ITEM_SELECT, ToolboxItemSelect);

package/core/events/events_trashcan_open.js

@@ -16,56 +16,57 @@
 goog.module('Blockly.Events.TrashcanOpen');
 
 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 trashcan open event.
- * @param {boolean=} opt_isOpen Whether the trashcan flyout is opening (false if
- *    opening). Undefined for a blank event.
- * @param {string=} opt_workspaceId The workspace identifier for this event.
- *    Undefined for a blank event.
  * @extends {UiBase}
- * @constructor
  * @alias Blockly.Events.TrashcanOpen
  */
-const TrashcanOpen = function(opt_isOpen, opt_workspaceId) {
-  TrashcanOpen.superClass_.constructor.call(this, opt_workspaceId);
-
+class TrashcanOpen extends UiBase {
   /**
-   * Whether the trashcan flyout is opening (false if closing).
-   * @type {boolean|undefined}
+   * @param {boolean=} opt_isOpen Whether the trashcan flyout is opening (false
+   *     if opening). Undefined for a blank event.
+   * @param {string=} opt_workspaceId The workspace identifier for this event.
+   *    Undefined for a blank event.
    */
-  this.isOpen = opt_isOpen;
-};
-object.inherits(TrashcanOpen, UiBase);
+  constructor(opt_isOpen, opt_workspaceId) {
+    super(opt_workspaceId);
 
-/**
- * Type of this event.
- * @type {string}
- */
-TrashcanOpen.prototype.type = eventUtils.TRASHCAN_OPEN;
+    /**
+     * Whether the trashcan flyout is opening (false if closing).
+     * @type {boolean|undefined}
+     */
+    this.isOpen = opt_isOpen;
 
-/**
- * Encode the event as JSON.
- * @return {!Object} JSON representation.
- */
-TrashcanOpen.prototype.toJson = function() {
-  const json = TrashcanOpen.superClass_.toJson.call(this);
-  json['isOpen'] = this.isOpen;
-  return json;
-};
+    /**
+     * Type of this event.
+     * @type {string}
+     */
+    this.type = eventUtils.TRASHCAN_OPEN;
+  }
 
-/**
- * Decode the JSON event.
- * @param {!Object} json JSON representation.
- */
-TrashcanOpen.prototype.fromJson = function(json) {
-  TrashcanOpen.superClass_.fromJson.call(this, json);
-  this.isOpen = json['isOpen'];
-};
+  /**
+   * Encode the event as JSON.
+   * @return {!Object} JSON representation.
+   */
+  toJson() {
+    const json = super.toJson();
+    json['isOpen'] = this.isOpen;
+    return json;
+  }
+
+  /**
+   * Decode the JSON event.
+   * @param {!Object} json JSON representation.
+   */
+  fromJson(json) {
+    super.fromJson(json);
+    this.isOpen = json['isOpen'];
+  }
+}
 
 registry.register(registry.Type.EVENT, eventUtils.TRASHCAN_OPEN, TrashcanOpen);
 

package/core/events/events_ui.js

@@ -18,7 +18,6 @@
 goog.module('Blockly.Events.Ui');
 
 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');
@@ -27,60 +26,62 @@ const {UiBase} = goog.require('Blockly.Events.UiBase');
 
 /**
  * Class for a UI event.
- * @param {?Block=} opt_block The affected block.  Null for UI events
- *     that do not have an associated block.  Undefined for a blank event.
- * @param {string=} opt_element One of 'selected', 'comment', 'mutatorOpen',
- *     etc.
- * @param {*=} opt_oldValue Previous value of element.
- * @param {*=} opt_newValue New value of element.
  * @extends {UiBase}
  * @deprecated December 2020. Instead use a more specific UI event.
- * @constructor
  * @alias Blockly.Events.Ui
  */
-const Ui = function(opt_block, opt_element, opt_oldValue, opt_newValue) {
-  const workspaceId = opt_block ? opt_block.workspace.id : undefined;
-  Ui.superClass_.constructor.call(this, workspaceId);
+class Ui extends UiBase {
+  /**
+   * @param {?Block=} opt_block The affected block.  Null for UI events
+   *     that do not have an associated block.  Undefined for a blank event.
+   * @param {string=} opt_element One of 'selected', 'comment', 'mutatorOpen',
+   *     etc.
+   * @param {*=} opt_oldValue Previous value of element.
+   * @param {*=} opt_newValue New value of element.
+   */
+  constructor(opt_block, opt_element, opt_oldValue, opt_newValue) {
+    const workspaceId = opt_block ? opt_block.workspace.id : undefined;
+    super(workspaceId);
 
-  this.blockId = opt_block ? opt_block.id : null;
-  this.element = typeof opt_element === 'undefined' ? '' : opt_element;
-  this.oldValue = typeof opt_oldValue === 'undefined' ? '' : opt_oldValue;
-  this.newValue = typeof opt_newValue === 'undefined' ? '' : opt_newValue;
-};
-object.inherits(Ui, UiBase);
+    this.blockId = opt_block ? opt_block.id : null;
+    this.element = typeof opt_element === 'undefined' ? '' : opt_element;
+    this.oldValue = typeof opt_oldValue === 'undefined' ? '' : opt_oldValue;
+    this.newValue = typeof opt_newValue === 'undefined' ? '' : opt_newValue;
 
-/**
- * Type of this event.
- * @type {string}
- */
-Ui.prototype.type = eventUtils.UI;
-
-/**
- * Encode the event as JSON.
- * @return {!Object} JSON representation.
- */
-Ui.prototype.toJson = function() {
-  const json = Ui.superClass_.toJson.call(this);
-  json['element'] = this.element;
-  if (this.newValue !== undefined) {
-    json['newValue'] = this.newValue;
+    /**
+     * Type of this event.
+     * @type {string}
+     */
+    this.type = eventUtils.UI;
   }
-  if (this.blockId) {
-    json['blockId'] = this.blockId;
+
+  /**
+   * Encode the event as JSON.
+   * @return {!Object} JSON representation.
+   */
+  toJson() {
+    const json = super.toJson();
+    json['element'] = this.element;
+    if (this.newValue !== undefined) {
+      json['newValue'] = this.newValue;
+    }
+    if (this.blockId) {
+      json['blockId'] = this.blockId;
+    }
+    return json;
   }
-  return json;
-};
 
-/**
- * Decode the JSON event.
- * @param {!Object} json JSON representation.
- */
-Ui.prototype.fromJson = function(json) {
-  Ui.superClass_.fromJson.call(this, json);
-  this.element = json['element'];
-  this.newValue = json['newValue'];
-  this.blockId = json['blockId'];
-};
+  /**
+   * Decode the JSON event.
+   * @param {!Object} json JSON representation.
+   */
+  fromJson(json) {
+    super.fromJson(json);
+    this.element = json['element'];
+    this.newValue = json['newValue'];
+    this.blockId = json['blockId'];
+  }
+}
 
 registry.register(registry.Type.EVENT, eventUtils.UI, Ui);
 

package/core/events/events_ui_base.js

@@ -17,8 +17,7 @@
  */
 goog.module('Blockly.Events.UiBase');
 
-const Abstract = goog.require('Blockly.Events.Abstract');
-const object = goog.require('Blockly.utils.object');
+const {Abstract: AbstractEvent} = goog.require('Blockly.Events.Abstract');
 
 
 /**
@@ -27,36 +26,38 @@ const object = goog.require('Blockly.utils.object');
  * editing to work (e.g. scrolling the workspace, zooming, opening toolbox
  * categories).
  * UI events do not undo or redo.
- * @param {string=} opt_workspaceId The workspace identifier for this event.
- *    Undefined for a blank event.
- * @extends {Abstract}
- * @constructor
+ * @extends {AbstractEvent}
  * @alias Blockly.Events.UiBase
  */
-const UiBase = function(opt_workspaceId) {
-  UiBase.superClass_.constructor.call(this);
-
-  /**
-   * Whether or not the event is blank (to be populated by fromJson).
-   * @type {boolean}
-   */
-  this.isBlank = typeof opt_workspaceId === 'undefined';
-
+class UiBase extends AbstractEvent {
   /**
-   * The workspace identifier for this event.
-   * @type {string}
+   * @param {string=} opt_workspaceId The workspace identifier for this event.
+   *    Undefined for a blank event.
    */
-  this.workspaceId = opt_workspaceId ? opt_workspaceId : '';
-
-  // UI events do not undo or redo.
-  this.recordUndo = false;
-};
-object.inherits(UiBase, Abstract);
-
-/**
- * Whether or not the event is a UI event.
- * @type {boolean}
- */
-UiBase.prototype.isUiEvent = true;
+  constructor(opt_workspaceId) {
+    super();
+
+    /**
+     * Whether or not the event is blank (to be populated by fromJson).
+     * @type {boolean}
+     */
+    this.isBlank = typeof opt_workspaceId === 'undefined';
+
+    /**
+     * The workspace identifier for this event.
+     * @type {string}
+     */
+    this.workspaceId = opt_workspaceId ? opt_workspaceId : '';
+
+    // UI events do not undo or redo.
+    this.recordUndo = false;
+
+    /**
+     * Whether or not the event is a UI event.
+     * @type {boolean}
+     */
+    this.isUiEvent = true;
+  }
+}
 
 exports.UiBase = UiBase;

package/core/events/events_var_base.js

@@ -15,55 +15,56 @@
  */
 goog.module('Blockly.Events.VarBase');
 
-const Abstract = goog.require('Blockly.Events.Abstract');
-const object = goog.require('Blockly.utils.object');
+const {Abstract: AbstractEvent} = goog.require('Blockly.Events.Abstract');
 /* eslint-disable-next-line no-unused-vars */
 const {VariableModel} = goog.requireType('Blockly.VariableModel');
 
 
 /**
  * Abstract class for a variable event.
- * @param {!VariableModel=} opt_variable The variable this event
- *     corresponds to.  Undefined for a blank event.
- * @extends {Abstract}
- * @constructor
+ * @extends {AbstractEvent}
  * @alias Blockly.Events.VarBase
  */
-const VarBase = function(opt_variable) {
-  VarBase.superClass_.constructor.call(this);
-  this.isBlank = typeof opt_variable === 'undefined';
-
+class VarBase extends AbstractEvent {
   /**
-   * The variable id for the variable this event pertains to.
-   * @type {string}
+   * @param {!VariableModel=} opt_variable The variable this event
+   *     corresponds to.  Undefined for a blank event.
    */
-  this.varId = this.isBlank ? '' : opt_variable.getId();
+  constructor(opt_variable) {
+    super();
+    this.isBlank = typeof opt_variable === 'undefined';
+
+    /**
+     * The variable id for the variable this event pertains to.
+     * @type {string}
+     */
+    this.varId = this.isBlank ? '' : opt_variable.getId();
+
+    /**
+     * The workspace identifier for this event.
+     * @type {string}
+     */
+    this.workspaceId = this.isBlank ? '' : opt_variable.workspace.id;
+  }
 
   /**
-   * The workspace identifier for this event.
-   * @type {string}
+   * Encode the event as JSON.
+   * @return {!Object} JSON representation.
    */
-  this.workspaceId = this.isBlank ? '' : opt_variable.workspace.id;
-};
-object.inherits(VarBase, Abstract);
-
-/**
- * Encode the event as JSON.
- * @return {!Object} JSON representation.
- */
-VarBase.prototype.toJson = function() {
-  const json = VarBase.superClass_.toJson.call(this);
-  json['varId'] = this.varId;
-  return json;
-};
+  toJson() {
+    const json = super.toJson();
+    json['varId'] = this.varId;
+    return json;
+  }
 
-/**
- * Decode the JSON event.
- * @param {!Object} json JSON representation.
- */
-VarBase.prototype.fromJson = function(json) {
-  VarBase.superClass_.toJson.call(this);
-  this.varId = json['varId'];
-};
+  /**
+   * Decode the JSON event.
+   * @param {!Object} json JSON representation.
+   */
+  fromJson(json) {
+    super.fromJson(json);
+    this.varId = json['varId'];
+  }
+}
 
 exports.VarBase = VarBase;

package/core/events/events_var_create.js

@@ -16,7 +16,6 @@
 goog.module('Blockly.Events.VarCreate');
 
 const eventUtils = goog.require('Blockly.Events.utils');
-const object = goog.require('Blockly.utils.object');
 const registry = goog.require('Blockly.registry');
 const {VarBase} = goog.require('Blockly.Events.VarBase');
 /* eslint-disable-next-line no-unused-vars */
@@ -25,62 +24,65 @@ const {VariableModel} = goog.requireType('Blockly.VariableModel');
 
 /**
  * Class for a variable creation event.
- * @param {!VariableModel=} opt_variable The created variable. Undefined
- *     for a blank event.
  * @extends {VarBase}
- * @constructor
  * @alias Blockly.Events.VarCreate
  */
-const VarCreate = function(opt_variable) {
-  VarCreate.superClass_.constructor.call(this, opt_variable);
-  if (!opt_variable) {
-    return;  // Blank event to be populated by fromJson.
-  }
+class VarCreate extends VarBase {
+  /**
+   * @param {!VariableModel=} opt_variable The created variable. Undefined
+   *     for a blank event.
+   */
+  constructor(opt_variable) {
+    super(opt_variable);
 
-  this.varType = opt_variable.type;
-  this.varName = opt_variable.name;
-};
-object.inherits(VarCreate, VarBase);
+    /**
+     * Type of this event.
+     * @type {string}
+     */
+    this.type = eventUtils.VAR_CREATE;
 
-/**
- * Type of this event.
- * @type {string}
- */
-VarCreate.prototype.type = eventUtils.VAR_CREATE;
+    if (!opt_variable) {
+      return;  // Blank event to be populated by fromJson.
+    }
 
-/**
- * Encode the event as JSON.
- * @return {!Object} JSON representation.
- */
-VarCreate.prototype.toJson = function() {
-  const json = VarCreate.superClass_.toJson.call(this);
-  json['varType'] = this.varType;
-  json['varName'] = this.varName;
-  return json;
-};
+    this.varType = opt_variable.type;
+    this.varName = opt_variable.name;
+  }
 
-/**
- * Decode the JSON event.
- * @param {!Object} json JSON representation.
- */
-VarCreate.prototype.fromJson = function(json) {
-  VarCreate.superClass_.fromJson.call(this, json);
-  this.varType = json['varType'];
-  this.varName = json['varName'];
-};
+  /**
+   * Encode the event as JSON.
+   * @return {!Object} JSON representation.
+   */
+  toJson() {
+    const json = super.toJson();
+    json['varType'] = this.varType;
+    json['varName'] = this.varName;
+    return json;
+  }
 
-/**
- * Run a variable creation event.
- * @param {boolean} forward True if run forward, false if run backward (undo).
- */
-VarCreate.prototype.run = function(forward) {
-  const workspace = this.getEventWorkspace_();
-  if (forward) {
-    workspace.createVariable(this.varName, this.varType, this.varId);
-  } else {
-    workspace.deleteVariableById(this.varId);
+  /**
+   * Decode the JSON event.
+   * @param {!Object} json JSON representation.
+   */
+  fromJson(json) {
+    super.fromJson(json);
+    this.varType = json['varType'];
+    this.varName = json['varName'];
+  }
+
+  /**
+   * Run a variable creation event.
+   * @param {boolean} forward True if run forward, false if run backward (undo).
+   */
+  run(forward) {
+    const workspace = this.getEventWorkspace_();
+    if (forward) {
+      workspace.createVariable(this.varName, this.varType, this.varId);
+    } else {
+      workspace.deleteVariableById(this.varId);
+    }
   }
-};
+}
 
 registry.register(registry.Type.EVENT, eventUtils.VAR_CREATE, VarCreate);