From cf97c1c15f9e92357d29e57732d838f3ac7c27d5 Mon Sep 17 00:00:00 2001
From: Aaron Dodson <adodson@google.com>
Date: Mon, 2 Aug 2021 11:08:51 -0700
Subject: [PATCH] Migrate core/events/events_marker_move.js to goog.module

---
 core/events/events_marker_move.js | 23 +++++++++++++----------
 tests/deps.js                     |  2 +-
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/core/events/events_marker_move.js b/core/events/events_marker_move.js
index acb28a66b..e85b5fd07 100644
--- a/core/events/events_marker_move.js
+++ b/core/events/events_marker_move.js
@@ -10,7 +10,8 @@
  */
 'use strict';
 
-goog.provide('Blockly.Events.MarkerMove');
+goog.module('Blockly.Events.MarkerMove');
+goog.module.declareLegacyNamespace();
 
 goog.require('Blockly.Events');
 goog.require('Blockly.Events.UiBase');
@@ -35,14 +36,14 @@ goog.requireType('Blockly.Workspace');
  * @extends {Blockly.Events.UiBase}
  * @constructor
  */
-Blockly.Events.MarkerMove = function(opt_block, isCursor, opt_oldNode,
+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() == Blockly.ASTNode.types.WORKSPACE) {
     workspaceId =
         (/** @type {!Blockly.Workspace} */ (opt_newNode.getLocation())).id;
   }
-  Blockly.Events.MarkerMove.superClass_.constructor.call(this, workspaceId);
+  MarkerMove.superClass_.constructor.call(this, workspaceId);
 
   /**
    * The workspace identifier for this event.
@@ -68,20 +69,20 @@ Blockly.Events.MarkerMove = function(opt_block, isCursor, opt_oldNode,
    */
   this.isCursor = isCursor;
 };
-Blockly.utils.object.inherits(Blockly.Events.MarkerMove, Blockly.Events.UiBase);
+Blockly.utils.object.inherits(MarkerMove, Blockly.Events.UiBase);
 
 /**
  * Type of this event.
  * @type {string}
  */
-Blockly.Events.MarkerMove.prototype.type = Blockly.Events.MARKER_MOVE;
+MarkerMove.prototype.type = Blockly.Events.MARKER_MOVE;
 
 /**
  * Encode the event as JSON.
  * @return {!Object} JSON representation.
  */
-Blockly.Events.MarkerMove.prototype.toJson = function() {
-  const json = Blockly.Events.MarkerMove.superClass_.toJson.call(this);
+MarkerMove.prototype.toJson = function() {
+  const json = MarkerMove.superClass_.toJson.call(this);
   json['isCursor'] = this.isCursor;
   json['blockId'] = this.blockId;
   json['oldNode'] = this.oldNode;
@@ -93,8 +94,8 @@ Blockly.Events.MarkerMove.prototype.toJson = function() {
  * Decode the JSON event.
  * @param {!Object} json JSON representation.
  */
-Blockly.Events.MarkerMove.prototype.fromJson = function(json) {
-  Blockly.Events.MarkerMove.superClass_.fromJson.call(this, json);
+MarkerMove.prototype.fromJson = function(json) {
+  MarkerMove.superClass_.fromJson.call(this, json);
   this.isCursor = json['isCursor'];
   this.blockId = json['blockId'];
   this.oldNode = json['oldNode'];
@@ -102,4 +103,6 @@ Blockly.Events.MarkerMove.prototype.fromJson = function(json) {
 };
 
 Blockly.registry.register(Blockly.registry.Type.EVENT,
-    Blockly.Events.MARKER_MOVE, Blockly.Events.MarkerMove);
+    Blockly.Events.MARKER_MOVE, MarkerMove);
+
+exports = MarkerMove;
diff --git a/tests/deps.js b/tests/deps.js
index 1e9ef54f4..7cb45f9bd 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -39,7 +39,7 @@ goog.addDependency('../../core/events/events_abstract.js', ['Blockly.Events.Abst
 goog.addDependency('../../core/events/events_block_drag.js', ['Blockly.Events.BlockDrag'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_bubble_open.js', ['Blockly.Events.BubbleOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_click.js', ['Blockly.Events.Click'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
-goog.addDependency('../../core/events/events_marker_move.js', ['Blockly.Events.MarkerMove'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
+goog.addDependency('../../core/events/events_marker_move.js', ['Blockly.Events.MarkerMove'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Selected'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_theme_change.js', ['Blockly.Events.ThemeChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);
 goog.addDependency('../../core/events/events_toolbox_item_select.js', ['Blockly.Events.ToolboxItemSelect'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']);