From 92df3900741e7b80d68f3483de08bada1d59f0c1 Mon Sep 17 00:00:00 2001 From: Aaron Dodson Date: Mon, 2 Aug 2021 09:19:57 -0700 Subject: [PATCH 1/4] Migrate core/events/events_viewport.js to ES6 const/let --- core/events/events_viewport.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/events/events_viewport.js b/core/events/events_viewport.js index 6d857cd67..552c709f0 100644 --- a/core/events/events_viewport.js +++ b/core/events/events_viewport.js @@ -77,7 +77,7 @@ Blockly.Events.ViewportChange.prototype.type = Blockly.Events.VIEWPORT_CHANGE; * @return {!Object} JSON representation. */ Blockly.Events.ViewportChange.prototype.toJson = function() { - var json = Blockly.Events.ViewportChange.superClass_.toJson.call(this); + const json = Blockly.Events.ViewportChange.superClass_.toJson.call(this); json['viewTop'] = this.viewTop; json['viewLeft'] = this.viewLeft; json['scale'] = this.scale; From 2294eb9a282b465dd5fbab670d853ce6ea387975 Mon Sep 17 00:00:00 2001 From: Aaron Dodson Date: Mon, 2 Aug 2021 09:22:04 -0700 Subject: [PATCH 2/4] Migrate core/events/events_viewport.js to goog.module --- core/events/events_viewport.js | 23 +++++++++++++---------- tests/deps.js | 2 +- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/core/events/events_viewport.js b/core/events/events_viewport.js index 552c709f0..4cca81050 100644 --- a/core/events/events_viewport.js +++ b/core/events/events_viewport.js @@ -10,7 +10,8 @@ */ 'use strict'; -goog.provide('Blockly.Events.ViewportChange'); +goog.module('Blockly.Events.ViewportChange'); +goog.module.declareLegacyNamespace(); goog.require('Blockly.Events'); goog.require('Blockly.Events.UiBase'); @@ -33,9 +34,9 @@ goog.require('Blockly.utils.object'); * @extends {Blockly.Events.UiBase} * @constructor */ -Blockly.Events.ViewportChange = function(opt_top, opt_left, opt_scale, +const ViewportChange = function(opt_top, opt_left, opt_scale, opt_workspaceId, opt_oldScale) { - Blockly.Events.ViewportChange.superClass_.constructor.call(this, opt_workspaceId); + ViewportChange.superClass_.constructor.call(this, opt_workspaceId); /** * Top-edge of the visible portion of the workspace, relative to the workspace @@ -63,21 +64,21 @@ Blockly.Events.ViewportChange = function(opt_top, opt_left, opt_scale, */ this.oldScale = opt_oldScale; }; -Blockly.utils.object.inherits(Blockly.Events.ViewportChange, +Blockly.utils.object.inherits(ViewportChange, Blockly.Events.UiBase); /** * Type of this event. * @type {string} */ -Blockly.Events.ViewportChange.prototype.type = Blockly.Events.VIEWPORT_CHANGE; +ViewportChange.prototype.type = Blockly.Events.VIEWPORT_CHANGE; /** * Encode the event as JSON. * @return {!Object} JSON representation. */ -Blockly.Events.ViewportChange.prototype.toJson = function() { - const json = Blockly.Events.ViewportChange.superClass_.toJson.call(this); +ViewportChange.prototype.toJson = function() { + const json = ViewportChange.superClass_.toJson.call(this); json['viewTop'] = this.viewTop; json['viewLeft'] = this.viewLeft; json['scale'] = this.scale; @@ -89,8 +90,8 @@ Blockly.Events.ViewportChange.prototype.toJson = function() { * Decode the JSON event. * @param {!Object} json JSON representation. */ -Blockly.Events.ViewportChange.prototype.fromJson = function(json) { - Blockly.Events.ViewportChange.superClass_.fromJson.call(this, json); +ViewportChange.prototype.fromJson = function(json) { + ViewportChange.superClass_.fromJson.call(this, json); this.viewTop = json['viewTop']; this.viewLeft = json['viewLeft']; this.scale = json['scale']; @@ -98,4 +99,6 @@ Blockly.Events.ViewportChange.prototype.fromJson = function(json) { }; Blockly.registry.register(Blockly.registry.Type.EVENT, - Blockly.Events.VIEWPORT_CHANGE, Blockly.Events.ViewportChange); + Blockly.Events.VIEWPORT_CHANGE, ViewportChange); + +exports = ViewportChange; diff --git a/tests/deps.js b/tests/deps.js index 1e9ef54f4..3b2de8ffa 100644 --- a/tests/deps.js +++ b/tests/deps.js @@ -44,7 +44,7 @@ goog.addDependency('../../core/events/events_selected.js', ['Blockly.Events.Sele 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']); goog.addDependency('../../core/events/events_trashcan_open.js', ['Blockly.Events.TrashcanOpen'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']); -goog.addDependency('../../core/events/events_viewport.js', ['Blockly.Events.ViewportChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object']); +goog.addDependency('../../core/events/events_viewport.js', ['Blockly.Events.ViewportChange'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/events/ui_events.js', ['Blockly.Events.Ui', 'Blockly.Events.UiBase'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object']); goog.addDependency('../../core/events/variable_events.js', ['Blockly.Events.VarBase', 'Blockly.Events.VarCreate', 'Blockly.Events.VarDelete', 'Blockly.Events.VarRename'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object']); goog.addDependency('../../core/events/workspace_events.js', ['Blockly.Events.FinishedLoading'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es5'}); From 38a459f5b4aecdce19fe4a11e752b27a51fea803 Mon Sep 17 00:00:00 2001 From: Aaron Dodson Date: Mon, 2 Aug 2021 09:35:39 -0700 Subject: [PATCH 3/4] Migrate core/events/events_viewport.js to named requires --- core/events/events_viewport.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/core/events/events_viewport.js b/core/events/events_viewport.js index 4cca81050..29af11802 100644 --- a/core/events/events_viewport.js +++ b/core/events/events_viewport.js @@ -13,10 +13,10 @@ goog.module('Blockly.Events.ViewportChange'); goog.module.declareLegacyNamespace(); -goog.require('Blockly.Events'); -goog.require('Blockly.Events.UiBase'); -goog.require('Blockly.registry'); -goog.require('Blockly.utils.object'); +const Events = goog.require('Blockly.Events'); +const UiBase = goog.require('Blockly.Events.UiBase'); +const object = goog.require('Blockly.utils.object'); +const registry = goog.require('Blockly.registry'); /** @@ -31,7 +31,7 @@ goog.require('Blockly.utils.object'); * Undefined for a blank event. * @param {number=} opt_oldScale The old scale of the workspace. Undefined for a * blank event. - * @extends {Blockly.Events.UiBase} + * @extends {UiBase} * @constructor */ const ViewportChange = function(opt_top, opt_left, opt_scale, @@ -64,14 +64,14 @@ const ViewportChange = function(opt_top, opt_left, opt_scale, */ this.oldScale = opt_oldScale; }; -Blockly.utils.object.inherits(ViewportChange, - Blockly.Events.UiBase); +object.inherits(ViewportChange, + UiBase); /** * Type of this event. * @type {string} */ -ViewportChange.prototype.type = Blockly.Events.VIEWPORT_CHANGE; +ViewportChange.prototype.type = Events.VIEWPORT_CHANGE; /** * Encode the event as JSON. @@ -98,7 +98,7 @@ ViewportChange.prototype.fromJson = function(json) { this.oldScale = json['oldScale']; }; -Blockly.registry.register(Blockly.registry.Type.EVENT, - Blockly.Events.VIEWPORT_CHANGE, ViewportChange); +registry.register(registry.Type.EVENT, + Events.VIEWPORT_CHANGE, ViewportChange); exports = ViewportChange; From d3ad80f654a33f66869d098a2c5d4e608f2a1977 Mon Sep 17 00:00:00 2001 From: Aaron Dodson Date: Mon, 2 Aug 2021 09:36:01 -0700 Subject: [PATCH 4/4] clang-format core/events/events_viewport.js --- core/events/events_viewport.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/core/events/events_viewport.js b/core/events/events_viewport.js index 29af11802..2cfd94a7f 100644 --- a/core/events/events_viewport.js +++ b/core/events/events_viewport.js @@ -34,8 +34,8 @@ const registry = goog.require('Blockly.registry'); * @extends {UiBase} * @constructor */ -const ViewportChange = function(opt_top, opt_left, opt_scale, - opt_workspaceId, opt_oldScale) { +const ViewportChange = function( + opt_top, opt_left, opt_scale, opt_workspaceId, opt_oldScale) { ViewportChange.superClass_.constructor.call(this, opt_workspaceId); /** @@ -64,8 +64,7 @@ const ViewportChange = function(opt_top, opt_left, opt_scale, */ this.oldScale = opt_oldScale; }; -object.inherits(ViewportChange, - UiBase); +object.inherits(ViewportChange, UiBase); /** * Type of this event. @@ -98,7 +97,6 @@ ViewportChange.prototype.fromJson = function(json) { this.oldScale = json['oldScale']; }; -registry.register(registry.Type.EVENT, - Events.VIEWPORT_CHANGE, ViewportChange); +registry.register(registry.Type.EVENT, Events.VIEWPORT_CHANGE, ViewportChange); exports = ViewportChange;