From 412d8101767449b40248cf38736db077b8c9ccd6 Mon Sep 17 00:00:00 2001 From: Aaron Dodson Date: Mon, 2 Aug 2021 09:52:24 -0700 Subject: [PATCH 01/18] Migrate core/events/events_toolbox_item_select.js to ES6 const/let --- core/events/events_toolbox_item_select.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/events/events_toolbox_item_select.js b/core/events/events_toolbox_item_select.js index a7dbb5305..694e24d5d 100644 --- a/core/events/events_toolbox_item_select.js +++ b/core/events/events_toolbox_item_select.js @@ -59,7 +59,7 @@ Blockly.Events.ToolboxItemSelect.prototype.type = Blockly.Events.TOOLBOX_ITEM_SE * @return {!Object} JSON representation. */ Blockly.Events.ToolboxItemSelect.prototype.toJson = function() { - var json = Blockly.Events.ToolboxItemSelect.superClass_.toJson.call(this); + const json = Blockly.Events.ToolboxItemSelect.superClass_.toJson.call(this); json['oldItem'] = this.oldItem; json['newItem'] = this.newItem; return json; From 7e9ee2d1c1f3bf6225d9570e629e9a0958086ae9 Mon Sep 17 00:00:00 2001 From: Aaron Dodson Date: Mon, 2 Aug 2021 09:52:43 -0700 Subject: [PATCH 02/18] Migrate core/events/events_toolbox_item_select.js to goog.module --- core/events/events_toolbox_item_select.js | 23 +++++++++++++---------- tests/deps.js | 2 +- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/core/events/events_toolbox_item_select.js b/core/events/events_toolbox_item_select.js index 694e24d5d..ec587ad92 100644 --- a/core/events/events_toolbox_item_select.js +++ b/core/events/events_toolbox_item_select.js @@ -10,7 +10,8 @@ */ 'use strict'; -goog.provide('Blockly.Events.ToolboxItemSelect'); +goog.module('Blockly.Events.ToolboxItemSelect'); +goog.module.declareLegacyNamespace(); goog.require('Blockly.Events'); goog.require('Blockly.Events.UiBase'); @@ -29,9 +30,9 @@ goog.require('Blockly.utils.object'); * @extends {Blockly.Events.UiBase} * @constructor */ -Blockly.Events.ToolboxItemSelect = function(opt_oldItem, opt_newItem, +const ToolboxItemSelect = function(opt_oldItem, opt_newItem, opt_workspaceId) { - Blockly.Events.ToolboxItemSelect.superClass_.constructor.call( + ToolboxItemSelect.superClass_.constructor.call( this, opt_workspaceId); /** @@ -46,20 +47,20 @@ Blockly.Events.ToolboxItemSelect = function(opt_oldItem, opt_newItem, */ this.newItem = opt_newItem; }; -Blockly.utils.object.inherits(Blockly.Events.ToolboxItemSelect, Blockly.Events.UiBase); +Blockly.utils.object.inherits(ToolboxItemSelect, Blockly.Events.UiBase); /** * Type of this event. * @type {string} */ -Blockly.Events.ToolboxItemSelect.prototype.type = Blockly.Events.TOOLBOX_ITEM_SELECT; +ToolboxItemSelect.prototype.type = Blockly.Events.TOOLBOX_ITEM_SELECT; /** * Encode the event as JSON. * @return {!Object} JSON representation. */ -Blockly.Events.ToolboxItemSelect.prototype.toJson = function() { - const json = Blockly.Events.ToolboxItemSelect.superClass_.toJson.call(this); +ToolboxItemSelect.prototype.toJson = function() { + const json = ToolboxItemSelect.superClass_.toJson.call(this); json['oldItem'] = this.oldItem; json['newItem'] = this.newItem; return json; @@ -69,11 +70,13 @@ Blockly.Events.ToolboxItemSelect.prototype.toJson = function() { * Decode the JSON event. * @param {!Object} json JSON representation. */ -Blockly.Events.ToolboxItemSelect.prototype.fromJson = function(json) { - Blockly.Events.ToolboxItemSelect.superClass_.fromJson.call(this, json); +ToolboxItemSelect.prototype.fromJson = function(json) { + ToolboxItemSelect.superClass_.fromJson.call(this, json); this.oldItem = json['oldItem']; this.newItem = json['newItem']; }; Blockly.registry.register(Blockly.registry.Type.EVENT, - Blockly.Events.TOOLBOX_ITEM_SELECT, Blockly.Events.ToolboxItemSelect); + Blockly.Events.TOOLBOX_ITEM_SELECT, ToolboxItemSelect); + +exports = ToolboxItemSelect; diff --git a/tests/deps.js b/tests/deps.js index 1e9ef54f4..c5dd33a1d 100644 --- a/tests/deps.js +++ b/tests/deps.js @@ -42,7 +42,7 @@ goog.addDependency('../../core/events/events_click.js', ['Blockly.Events.Click'] 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_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']); +goog.addDependency('../../core/events/events_toolbox_item_select.js', ['Blockly.Events.ToolboxItemSelect'], ['Blockly.Events', 'Blockly.Events.UiBase', 'Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'}); 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/ui_events.js', ['Blockly.Events.Ui', 'Blockly.Events.UiBase'], ['Blockly.Events', 'Blockly.Events.Abstract', 'Blockly.registry', 'Blockly.utils.object']); From df71e638303c274fa0f87551c02231a8ac4469ff Mon Sep 17 00:00:00 2001 From: Aaron Dodson Date: Mon, 2 Aug 2021 09:53:12 -0700 Subject: [PATCH 03/18] Migrate core/events/events_toolbox_item_select.js to named requires --- core/events/events_toolbox_item_select.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/core/events/events_toolbox_item_select.js b/core/events/events_toolbox_item_select.js index ec587ad92..0ef7111f8 100644 --- a/core/events/events_toolbox_item_select.js +++ b/core/events/events_toolbox_item_select.js @@ -13,10 +13,10 @@ goog.module('Blockly.Events.ToolboxItemSelect'); 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'); /** @@ -27,7 +27,7 @@ goog.require('Blockly.utils.object'); * a blank event. * @param {string=} opt_workspaceId The workspace identifier for this event. * Undefined for a blank event. - * @extends {Blockly.Events.UiBase} + * @extends {UiBase} * @constructor */ const ToolboxItemSelect = function(opt_oldItem, opt_newItem, @@ -47,13 +47,13 @@ const ToolboxItemSelect = function(opt_oldItem, opt_newItem, */ this.newItem = opt_newItem; }; -Blockly.utils.object.inherits(ToolboxItemSelect, Blockly.Events.UiBase); +object.inherits(ToolboxItemSelect, UiBase); /** * Type of this event. * @type {string} */ -ToolboxItemSelect.prototype.type = Blockly.Events.TOOLBOX_ITEM_SELECT; +ToolboxItemSelect.prototype.type = Events.TOOLBOX_ITEM_SELECT; /** * Encode the event as JSON. @@ -76,7 +76,7 @@ ToolboxItemSelect.prototype.fromJson = function(json) { this.newItem = json['newItem']; }; -Blockly.registry.register(Blockly.registry.Type.EVENT, - Blockly.Events.TOOLBOX_ITEM_SELECT, ToolboxItemSelect); +registry.register(registry.Type.EVENT, + Events.TOOLBOX_ITEM_SELECT, ToolboxItemSelect); exports = ToolboxItemSelect; From bee144fae2a081ad99c073b8f9786d05285b0338 Mon Sep 17 00:00:00 2001 From: Aaron Dodson Date: Mon, 2 Aug 2021 09:53:38 -0700 Subject: [PATCH 04/18] clang-format core/events/events_toolbox_item_select.js --- core/events/events_toolbox_item_select.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/core/events/events_toolbox_item_select.js b/core/events/events_toolbox_item_select.js index 0ef7111f8..0fddaf4e9 100644 --- a/core/events/events_toolbox_item_select.js +++ b/core/events/events_toolbox_item_select.js @@ -30,10 +30,8 @@ const registry = goog.require('Blockly.registry'); * @extends {UiBase} * @constructor */ -const ToolboxItemSelect = function(opt_oldItem, opt_newItem, - opt_workspaceId) { - ToolboxItemSelect.superClass_.constructor.call( - this, opt_workspaceId); +const ToolboxItemSelect = function(opt_oldItem, opt_newItem, opt_workspaceId) { + ToolboxItemSelect.superClass_.constructor.call(this, opt_workspaceId); /** * The previously selected toolbox item. @@ -76,7 +74,7 @@ ToolboxItemSelect.prototype.fromJson = function(json) { this.newItem = json['newItem']; }; -registry.register(registry.Type.EVENT, - Events.TOOLBOX_ITEM_SELECT, ToolboxItemSelect); +registry.register( + registry.Type.EVENT, Events.TOOLBOX_ITEM_SELECT, ToolboxItemSelect); exports = ToolboxItemSelect; From 8c2a469931a733c973a3ab4fde4f31b23fd62420 Mon Sep 17 00:00:00 2001 From: Aaron Dodson Date: Mon, 2 Aug 2021 11:04:40 -0700 Subject: [PATCH 05/18] Migrate core/events/events_marker_move.js to ES6 const/let --- core/events/events_marker_move.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/events/events_marker_move.js b/core/events/events_marker_move.js index ab839daff..acb28a66b 100644 --- a/core/events/events_marker_move.js +++ b/core/events/events_marker_move.js @@ -37,7 +37,7 @@ goog.requireType('Blockly.Workspace'); */ Blockly.Events.MarkerMove = function(opt_block, isCursor, opt_oldNode, opt_newNode) { - var workspaceId = opt_block ? opt_block.workspace.id : undefined; + 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; @@ -81,7 +81,7 @@ Blockly.Events.MarkerMove.prototype.type = Blockly.Events.MARKER_MOVE; * @return {!Object} JSON representation. */ Blockly.Events.MarkerMove.prototype.toJson = function() { - var json = Blockly.Events.MarkerMove.superClass_.toJson.call(this); + const json = Blockly.Events.MarkerMove.superClass_.toJson.call(this); json['isCursor'] = this.isCursor; json['blockId'] = this.blockId; json['oldNode'] = this.oldNode; From cf97c1c15f9e92357d29e57732d838f3ac7c27d5 Mon Sep 17 00:00:00 2001 From: Aaron Dodson Date: Mon, 2 Aug 2021 11:08:51 -0700 Subject: [PATCH 06/18] 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']); From b9af6677e851bb194e38c06ba5fa9d09602cee8d Mon Sep 17 00:00:00 2001 From: Aaron Dodson Date: Mon, 2 Aug 2021 11:14:52 -0700 Subject: [PATCH 07/18] Migrate core/events/events_marker_move.js to named requires --- core/events/events_marker_move.js | 41 ++++++++++++++++--------------- tests/deps.js | 2 +- 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/core/events/events_marker_move.js b/core/events/events_marker_move.js index e85b5fd07..e4c0f2f9c 100644 --- a/core/events/events_marker_move.js +++ b/core/events/events_marker_move.js @@ -13,35 +13,36 @@ goog.module('Blockly.Events.MarkerMove'); goog.module.declareLegacyNamespace(); -goog.require('Blockly.Events'); -goog.require('Blockly.Events.UiBase'); -goog.require('Blockly.registry'); -goog.require('Blockly.utils.object'); - -goog.requireType('Blockly.ASTNode'); -goog.requireType('Blockly.Block'); -goog.requireType('Blockly.Workspace'); +const ASTNode = goog.require('Blockly.ASTNode'); +/* eslint-disable-next-line no-unused-vars */ +const Block = goog.requireType('Blockly.Block'); +const Events = goog.require('Blockly.Events'); +const UiBase = goog.require('Blockly.Events.UiBase'); +/* eslint-disable-next-line no-unused-vars */ +const Workspace = goog.requireType('Blockly.Workspace'); +const object = goog.require('Blockly.utils.object'); +const registry = goog.require('Blockly.registry'); /** * Class for a marker move event. - * @param {?Blockly.Block=} opt_block The affected block. Null if current node + * @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 {?Blockly.ASTNode=} opt_oldNode The old node the marker used to be on. + * @param {?ASTNode=} opt_oldNode The old node the marker used to be on. * Undefined for a blank event. - * @param {!Blockly.ASTNode=} opt_newNode The new node the marker is now on. + * @param {!ASTNode=} opt_newNode The new node the marker is now on. * Undefined for a blank event. - * @extends {Blockly.Events.UiBase} + * @extends {UiBase} * @constructor */ 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) { + if (opt_newNode && opt_newNode.getType() == ASTNode.types.WORKSPACE) { workspaceId = - (/** @type {!Blockly.Workspace} */ (opt_newNode.getLocation())).id; + (/** @type {!Workspace} */ (opt_newNode.getLocation())).id; } MarkerMove.superClass_.constructor.call(this, workspaceId); @@ -53,13 +54,13 @@ const MarkerMove = function(opt_block, isCursor, opt_oldNode, /** * The old node the marker used to be on. - * @type {?Blockly.ASTNode|undefined} + * @type {?ASTNode|undefined} */ this.oldNode = opt_oldNode; /** * The new node the marker is now on. - * @type {Blockly.ASTNode|undefined} + * @type {ASTNode|undefined} */ this.newNode = opt_newNode; @@ -69,13 +70,13 @@ const MarkerMove = function(opt_block, isCursor, opt_oldNode, */ this.isCursor = isCursor; }; -Blockly.utils.object.inherits(MarkerMove, Blockly.Events.UiBase); +object.inherits(MarkerMove, UiBase); /** * Type of this event. * @type {string} */ -MarkerMove.prototype.type = Blockly.Events.MARKER_MOVE; +MarkerMove.prototype.type = Events.MARKER_MOVE; /** * Encode the event as JSON. @@ -102,7 +103,7 @@ MarkerMove.prototype.fromJson = function(json) { this.newNode = json['newNode']; }; -Blockly.registry.register(Blockly.registry.Type.EVENT, - Blockly.Events.MARKER_MOVE, MarkerMove); +registry.register(registry.Type.EVENT, + Events.MARKER_MOVE, MarkerMove); exports = MarkerMove; diff --git a/tests/deps.js b/tests/deps.js index 7cb45f9bd..cdb39710c 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'], {'lang': 'es6', 'module': 'goog'}); +goog.addDependency('../../core/events/events_marker_move.js', ['Blockly.Events.MarkerMove'], ['Blockly.ASTNode', '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']); From 3f83a8f600ea130d9ff1340fd163d4bbcde48150 Mon Sep 17 00:00:00 2001 From: Aaron Dodson Date: Mon, 2 Aug 2021 11:15:11 -0700 Subject: [PATCH 08/18] clang-format core/events/events_marker_move.js --- core/events/events_marker_move.js | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/core/events/events_marker_move.js b/core/events/events_marker_move.js index e4c0f2f9c..2d0e0957b 100644 --- a/core/events/events_marker_move.js +++ b/core/events/events_marker_move.js @@ -37,12 +37,10 @@ const registry = goog.require('Blockly.registry'); * @extends {UiBase} * @constructor */ -const MarkerMove = function(opt_block, isCursor, opt_oldNode, - opt_newNode) { +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; + workspaceId = (/** @type {!Workspace} */ (opt_newNode.getLocation())).id; } MarkerMove.superClass_.constructor.call(this, workspaceId); @@ -103,7 +101,6 @@ MarkerMove.prototype.fromJson = function(json) { this.newNode = json['newNode']; }; -registry.register(registry.Type.EVENT, - Events.MARKER_MOVE, MarkerMove); +registry.register(registry.Type.EVENT, Events.MARKER_MOVE, MarkerMove); exports = MarkerMove; From d1191fb7b5712f59ca9cf743121846505ce3b2ce Mon Sep 17 00:00:00 2001 From: kozbial Date: Fri, 23 Jul 2021 19:39:56 -0700 Subject: [PATCH 09/18] Migrate core/positionable_helpers.js to ES6 const/let --- core/positionable_helpers.js | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/core/positionable_helpers.js b/core/positionable_helpers.js index 3dc52e50c..fb33f177f 100644 --- a/core/positionable_helpers.js +++ b/core/positionable_helpers.js @@ -80,8 +80,8 @@ Blockly.uiPosition.getStartPositionRect = function( position, size, horizontalPadding, verticalPadding, metrics, workspace) { // Horizontal positioning. - var left = 0; - var hasVerticalScrollbar = + let left = 0; + const hasVerticalScrollbar = workspace.scrollbar && workspace.scrollbar.canScrollVertically(); if (position.horizontal === Blockly.uiPosition.horizontalPosition.LEFT) { @@ -97,7 +97,7 @@ Blockly.uiPosition.getStartPositionRect = function( } } // Vertical positioning. - var top = 0; + let top = 0; if (position.vertical === Blockly.uiPosition.verticalPosition.TOP) { top = metrics.absoluteMetrics.top + verticalPadding; @@ -124,15 +124,15 @@ Blockly.uiPosition.getStartPositionRect = function( * @package */ Blockly.uiPosition.getCornerOppositeToolbox = function(workspace, metrics) { - var leftCorner = + const leftCorner = metrics.toolboxMetrics.position !== Blockly.utils.toolbox.Position.LEFT && (!workspace.horizontalLayout || workspace.RTL); - var topCorner = + const topCorner = metrics.toolboxMetrics.position === Blockly.utils.toolbox.Position.BOTTOM; - var horizontalPosition = leftCorner ? + const horizontalPosition = leftCorner ? Blockly.uiPosition.horizontalPosition.LEFT : Blockly.uiPosition.horizontalPosition.RIGHT; - var verticalPosition = topCorner ? + const verticalPosition = topCorner ? Blockly.uiPosition.verticalPosition.TOP : Blockly.uiPosition.verticalPosition.BOTTOM; return { @@ -156,14 +156,15 @@ Blockly.uiPosition.getCornerOppositeToolbox = function(workspace, metrics) { */ Blockly.uiPosition.bumpPositionRect = function( startRect, margin, bumpDirection, savedPositions) { - var top = startRect.top; - var left = startRect.left; - var width = startRect.right - startRect.left; - var height = startRect.bottom - startRect.top; + let top = startRect.top; + const left = startRect.left; + const width = startRect.right - startRect.left; + const height = startRect.bottom - startRect.top; // Check for collision and bump if needed. - var boundingRect = startRect; - for (var i = 0, otherEl; (otherEl = savedPositions[i]); i++) { + let boundingRect = startRect; + for (let i = 0; i < savedPositions.length; i++) { + const otherEl = savedPositions[i]; if (boundingRect.intersects(otherEl)) { if (bumpDirection === Blockly.uiPosition.bumpDirection.UP) { top = otherEl.top - height - margin; From 1d72126e1d8ad255574e501a5d306868e8f83f08 Mon Sep 17 00:00:00 2001 From: kozbial Date: Fri, 23 Jul 2021 19:43:56 -0700 Subject: [PATCH 10/18] Migrate core/positionable_helpers.js to goog.module --- core/positionable_helpers.js | 74 ++++++++++++++++++++---------------- tests/deps.js | 2 +- 2 files changed, 42 insertions(+), 34 deletions(-) diff --git a/core/positionable_helpers.js b/core/positionable_helpers.js index fb33f177f..9ca1d0759 100644 --- a/core/positionable_helpers.js +++ b/core/positionable_helpers.js @@ -10,62 +10,68 @@ */ 'use strict'; -goog.provide('Blockly.uiPosition'); +goog.module('Blockly.uiPosition'); +goog.module.declareLegacyNamespace(); goog.require('Blockly.Scrollbar'); goog.require('Blockly.utils.Rect'); goog.require('Blockly.utils.toolbox'); goog.requireType('Blockly.MetricsManager'); +goog.requireType('Blockly.utils.Size'); goog.requireType('Blockly.WorkspaceSvg'); /** * Enum for vertical positioning. * @enum {number} - * @package */ -Blockly.uiPosition.verticalPosition = { +const verticalPosition = { TOP: 0, BOTTOM: 1 }; +/** @package */ +exports.verticalPosition = verticalPosition; /** * Enum for horizontal positioning. * @enum {number} - * @package */ -Blockly.uiPosition.horizontalPosition = { +const horizontalPosition = { LEFT: 0, RIGHT: 1 }; +/** @package */ +exports.horizontalPosition = horizontalPosition; /** * An object defining a horizontal and vertical positioning. * @typedef {{ - * horizontal: !Blockly.uiPosition.horizontalPosition, - * vertical: !Blockly.uiPosition.verticalPosition + * horizontal: !horizontalPosition, + * vertical: !verticalPosition * }} - * @package */ -Blockly.uiPosition.Position; +let Position; +/** @package */ +exports.Position = Position; /** * Enum for bump rules to use for dealing with collisions. * @enum {number} - * @package */ -Blockly.uiPosition.bumpDirection = { +const bumpDirection = { UP: 0, DOWN: 1 }; +/** @package */ +exports.bumpDirection = bumpDirection; /** * Returns a rectangle representing reasonable position for where to place a UI * element of the specified size given the restraints and locations of the * scrollbars. This method does not take into account any already placed UI * elements. - * @param {!Blockly.uiPosition.Position} position The starting + * @param {!Position} position The starting * horizontal and vertical position. * @param {!Blockly.utils.Size} size the size of the UI element to get a start * position for. @@ -74,9 +80,8 @@ Blockly.uiPosition.bumpDirection = { * @param {!Blockly.MetricsManager.UiMetrics} metrics The workspace UI metrics. * @param {!Blockly.WorkspaceSvg} workspace The workspace. * @return {!Blockly.utils.Rect} The suggested start position. - * @package */ -Blockly.uiPosition.getStartPositionRect = function( +const getStartPositionRect = function( position, size, horizontalPadding, verticalPadding, metrics, workspace) { // Horizontal positioning. @@ -84,7 +89,7 @@ Blockly.uiPosition.getStartPositionRect = function( const hasVerticalScrollbar = workspace.scrollbar && workspace.scrollbar.canScrollVertically(); if (position.horizontal === - Blockly.uiPosition.horizontalPosition.LEFT) { + horizontalPosition.LEFT) { left = metrics.absoluteMetrics.left + horizontalPadding; if (hasVerticalScrollbar && workspace.RTL) { left += Blockly.Scrollbar.scrollbarThickness; @@ -99,7 +104,7 @@ Blockly.uiPosition.getStartPositionRect = function( // Vertical positioning. let top = 0; if (position.vertical === - Blockly.uiPosition.verticalPosition.TOP) { + verticalPosition.TOP) { top = metrics.absoluteMetrics.top + verticalPadding; } else { // position.vertical == verticalPosition.BOTTOM top = metrics.absoluteMetrics.top + metrics.viewMetrics.height - @@ -112,6 +117,8 @@ Blockly.uiPosition.getStartPositionRect = function( return new Blockly.utils.Rect( top, top + size.height, left, left + size.width); }; +/** @package */ +exports.getStartPositionRect = getStartPositionRect; /** * Returns a corner position that is on the opposite side of the workspace from @@ -120,26 +127,26 @@ Blockly.uiPosition.getStartPositionRect = function( * orientation, defaults to the right corner. * @param {!Blockly.WorkspaceSvg} workspace The workspace. * @param {!Blockly.MetricsManager.UiMetrics} metrics The workspace metrics. - * @return {!Blockly.uiPosition.Position} The suggested corner position. + * @return {!Position} The suggested corner position. * @package */ -Blockly.uiPosition.getCornerOppositeToolbox = function(workspace, metrics) { +const getCornerOppositeToolbox = function(workspace, metrics) { const leftCorner = metrics.toolboxMetrics.position !== Blockly.utils.toolbox.Position.LEFT && (!workspace.horizontalLayout || workspace.RTL); const topCorner = metrics.toolboxMetrics.position === Blockly.utils.toolbox.Position.BOTTOM; - const horizontalPosition = leftCorner ? - Blockly.uiPosition.horizontalPosition.LEFT : - Blockly.uiPosition.horizontalPosition.RIGHT; - const verticalPosition = topCorner ? - Blockly.uiPosition.verticalPosition.TOP : - Blockly.uiPosition.verticalPosition.BOTTOM; + const hPosition = leftCorner ? + horizontalPosition.LEFT : horizontalPosition.RIGHT; + const vPosition = topCorner ? + verticalPosition.TOP : verticalPosition.BOTTOM; return { - horizontal: horizontalPosition, - vertical: verticalPosition + horizontal: hPosition, + vertical: vPosition }; }; +/** @package */ +exports.getCornerOppositeToolbox = getCornerOppositeToolbox; /** * Returns a position Rect based on a starting position that is bumped @@ -147,15 +154,14 @@ Blockly.uiPosition.getCornerOppositeToolbox = function(workspace, metrics) { * method does not check that the bumped position is still within bounds. * @param {!Blockly.utils.Rect} startRect The starting position to use. * @param {number} margin The margin to use between elements when bumping. - * @param {!Blockly.uiPosition.bumpDirection} bumpDirection The direction - * to bump if there is a collision with an existing UI element. + * @param {!bumpDirection} bumpDir The direction to bump if there is a collision + * with an existing UI element. * @param {!Array} savedPositions List of rectangles that * represent the positions of UI elements already placed. * @return {!Blockly.utils.Rect} The suggested position rectangle. - * @package */ -Blockly.uiPosition.bumpPositionRect = function( - startRect, margin, bumpDirection, savedPositions) { +const bumpPositionRect = function( + startRect, margin, bumpDir, savedPositions) { let top = startRect.top; const left = startRect.left; const width = startRect.right - startRect.left; @@ -166,9 +172,9 @@ Blockly.uiPosition.bumpPositionRect = function( for (let i = 0; i < savedPositions.length; i++) { const otherEl = savedPositions[i]; if (boundingRect.intersects(otherEl)) { - if (bumpDirection === Blockly.uiPosition.bumpDirection.UP) { + if (bumpDir === bumpDirection.UP) { top = otherEl.top - height - margin; - } else { // bumpDirection == bumpDirection.DOWN + } else { // bumpDir == bumpDirection.DOWN top = otherEl.bottom + margin; } // Recheck other savedPositions @@ -179,3 +185,5 @@ Blockly.uiPosition.bumpPositionRect = function( } return boundingRect; }; +/** @package */ +exports.bumpPositionRect = bumpPositionRect; diff --git a/tests/deps.js b/tests/deps.js index 556839dd2..e250dc441 100644 --- a/tests/deps.js +++ b/tests/deps.js @@ -117,7 +117,7 @@ goog.addDependency('../../core/msg.js', ['Blockly.Msg'], ['Blockly.utils.global' goog.addDependency('../../core/mutator.js', ['Blockly.Mutator'], ['Blockly.Bubble', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Events.BubbleOpen', 'Blockly.Icon', 'Blockly.Options', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox', 'Blockly.utils.xml'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/names.js', ['Blockly.Names'], ['Blockly.Msg', 'Blockly.internalConstants']); goog.addDependency('../../core/options.js', ['Blockly.Options'], ['Blockly.Theme', 'Blockly.Themes.Classic', 'Blockly.registry', 'Blockly.utils.IdGenerator', 'Blockly.utils.Metrics', 'Blockly.utils.toolbox']); -goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], ['Blockly.Scrollbar', 'Blockly.utils.Rect', 'Blockly.utils.toolbox']); +goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'], ['Blockly.Scrollbar', 'Blockly.utils.Rect', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Blocks', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils.xml']); goog.addDependency('../../core/registry.js', ['Blockly.registry'], [], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.Events', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'}); From c59f083485ca474d01dd2af75926073fe8864459 Mon Sep 17 00:00:00 2001 From: kozbial Date: Thu, 29 Jul 2021 14:21:57 -0700 Subject: [PATCH 11/18] Migrate core/positionable_helpers.js named requires --- core/positionable_helpers.js | 45 ++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/core/positionable_helpers.js b/core/positionable_helpers.js index 9ca1d0759..6579a5a4e 100644 --- a/core/positionable_helpers.js +++ b/core/positionable_helpers.js @@ -13,13 +13,12 @@ goog.module('Blockly.uiPosition'); goog.module.declareLegacyNamespace(); -goog.require('Blockly.Scrollbar'); -goog.require('Blockly.utils.Rect'); -goog.require('Blockly.utils.toolbox'); - -goog.requireType('Blockly.MetricsManager'); -goog.requireType('Blockly.utils.Size'); -goog.requireType('Blockly.WorkspaceSvg'); +const MetricsManager = goog.requireType('Blockly.MetricsManager'); +const Rect = goog.require('Blockly.utils.Rect'); +const Scrollbar = goog.require('Blockly.Scrollbar'); +const Size = goog.requireType('Blockly.utils.Size'); +const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); +const toolbox = goog.require('Blockly.utils.toolbox'); /** @@ -73,13 +72,13 @@ exports.bumpDirection = bumpDirection; * elements. * @param {!Position} position The starting * horizontal and vertical position. - * @param {!Blockly.utils.Size} size the size of the UI element to get a start + * @param {!Size} size the size of the UI element to get a start * position for. * @param {number} horizontalPadding The horizontal padding to use. * @param {number} verticalPadding The vertical padding to use. - * @param {!Blockly.MetricsManager.UiMetrics} metrics The workspace UI metrics. - * @param {!Blockly.WorkspaceSvg} workspace The workspace. - * @return {!Blockly.utils.Rect} The suggested start position. + * @param {!MetricsManager.UiMetrics} metrics The workspace UI metrics. + * @param {!WorkspaceSvg} workspace The workspace. + * @return {!Rect} The suggested start position. */ const getStartPositionRect = function( position, size, horizontalPadding, @@ -92,13 +91,13 @@ const getStartPositionRect = function( horizontalPosition.LEFT) { left = metrics.absoluteMetrics.left + horizontalPadding; if (hasVerticalScrollbar && workspace.RTL) { - left += Blockly.Scrollbar.scrollbarThickness; + left += Scrollbar.scrollbarThickness; } } else { // position.horizontal == horizontalPosition.RIGHT left = metrics.absoluteMetrics.left + metrics.viewMetrics.width - size.width - horizontalPadding; if (hasVerticalScrollbar && !workspace.RTL) { - left -= Blockly.Scrollbar.scrollbarThickness; + left -= Scrollbar.scrollbarThickness; } } // Vertical positioning. @@ -111,10 +110,10 @@ const getStartPositionRect = function( size.height - verticalPadding; if (workspace.scrollbar && workspace.scrollbar.canScrollHorizontally()) { // The scrollbars are always positioned on the bottom if they exist. - top -= Blockly.Scrollbar.scrollbarThickness; + top -= Scrollbar.scrollbarThickness; } } - return new Blockly.utils.Rect( + return new Rect( top, top + size.height, left, left + size.width); }; /** @package */ @@ -125,17 +124,17 @@ exports.getStartPositionRect = getStartPositionRect; * the toolbox. * If in horizontal orientation, defaults to the bottom corner. If in vertical * orientation, defaults to the right corner. - * @param {!Blockly.WorkspaceSvg} workspace The workspace. - * @param {!Blockly.MetricsManager.UiMetrics} metrics The workspace metrics. + * @param {!WorkspaceSvg} workspace The workspace. + * @param {!MetricsManager.UiMetrics} metrics The workspace metrics. * @return {!Position} The suggested corner position. * @package */ const getCornerOppositeToolbox = function(workspace, metrics) { const leftCorner = - metrics.toolboxMetrics.position !== Blockly.utils.toolbox.Position.LEFT && + metrics.toolboxMetrics.position !== toolbox.Position.LEFT && (!workspace.horizontalLayout || workspace.RTL); const topCorner = - metrics.toolboxMetrics.position === Blockly.utils.toolbox.Position.BOTTOM; + metrics.toolboxMetrics.position === toolbox.Position.BOTTOM; const hPosition = leftCorner ? horizontalPosition.LEFT : horizontalPosition.RIGHT; const vPosition = topCorner ? @@ -152,13 +151,13 @@ exports.getCornerOppositeToolbox = getCornerOppositeToolbox; * Returns a position Rect based on a starting position that is bumped * so that it doesn't intersect with any of the provided savedPositions. This * method does not check that the bumped position is still within bounds. - * @param {!Blockly.utils.Rect} startRect The starting position to use. + * @param {!Rect} startRect The starting position to use. * @param {number} margin The margin to use between elements when bumping. * @param {!bumpDirection} bumpDir The direction to bump if there is a collision * with an existing UI element. - * @param {!Array} savedPositions List of rectangles that + * @param {!Array} savedPositions List of rectangles that * represent the positions of UI elements already placed. - * @return {!Blockly.utils.Rect} The suggested position rectangle. + * @return {!Rect} The suggested position rectangle. */ const bumpPositionRect = function( startRect, margin, bumpDir, savedPositions) { @@ -178,7 +177,7 @@ const bumpPositionRect = function( top = otherEl.bottom + margin; } // Recheck other savedPositions - boundingRect = new Blockly.utils.Rect( + boundingRect = new Rect( top, top + height, left, left + width); i = -1; } From b3cd8b7c861d5e69efa0d7c2d0827ad0bbc917f3 Mon Sep 17 00:00:00 2001 From: kozbial Date: Thu, 29 Jul 2021 14:22:11 -0700 Subject: [PATCH 12/18] clang-format core/positionable_helpers.js --- core/positionable_helpers.js | 33 +++++++++++---------------------- 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/core/positionable_helpers.js b/core/positionable_helpers.js index 6579a5a4e..9e45d5a68 100644 --- a/core/positionable_helpers.js +++ b/core/positionable_helpers.js @@ -81,14 +81,12 @@ exports.bumpDirection = bumpDirection; * @return {!Rect} The suggested start position. */ const getStartPositionRect = function( - position, size, horizontalPadding, - verticalPadding, metrics, workspace) { + position, size, horizontalPadding, verticalPadding, metrics, workspace) { // Horizontal positioning. let left = 0; const hasVerticalScrollbar = workspace.scrollbar && workspace.scrollbar.canScrollVertically(); - if (position.horizontal === - horizontalPosition.LEFT) { + if (position.horizontal === horizontalPosition.LEFT) { left = metrics.absoluteMetrics.left + horizontalPadding; if (hasVerticalScrollbar && workspace.RTL) { left += Scrollbar.scrollbarThickness; @@ -102,8 +100,7 @@ const getStartPositionRect = function( } // Vertical positioning. let top = 0; - if (position.vertical === - verticalPosition.TOP) { + if (position.vertical === verticalPosition.TOP) { top = metrics.absoluteMetrics.top + verticalPadding; } else { // position.vertical == verticalPosition.BOTTOM top = metrics.absoluteMetrics.top + metrics.viewMetrics.height - @@ -113,8 +110,7 @@ const getStartPositionRect = function( top -= Scrollbar.scrollbarThickness; } } - return new Rect( - top, top + size.height, left, left + size.width); + return new Rect(top, top + size.height, left, left + size.width); }; /** @package */ exports.getStartPositionRect = getStartPositionRect; @@ -133,16 +129,11 @@ const getCornerOppositeToolbox = function(workspace, metrics) { const leftCorner = metrics.toolboxMetrics.position !== toolbox.Position.LEFT && (!workspace.horizontalLayout || workspace.RTL); - const topCorner = - metrics.toolboxMetrics.position === toolbox.Position.BOTTOM; - const hPosition = leftCorner ? - horizontalPosition.LEFT : horizontalPosition.RIGHT; - const vPosition = topCorner ? - verticalPosition.TOP : verticalPosition.BOTTOM; - return { - horizontal: hPosition, - vertical: vPosition - }; + const topCorner = metrics.toolboxMetrics.position === toolbox.Position.BOTTOM; + const hPosition = + leftCorner ? horizontalPosition.LEFT : horizontalPosition.RIGHT; + const vPosition = topCorner ? verticalPosition.TOP : verticalPosition.BOTTOM; + return {horizontal: hPosition, vertical: vPosition}; }; /** @package */ exports.getCornerOppositeToolbox = getCornerOppositeToolbox; @@ -159,8 +150,7 @@ exports.getCornerOppositeToolbox = getCornerOppositeToolbox; * represent the positions of UI elements already placed. * @return {!Rect} The suggested position rectangle. */ -const bumpPositionRect = function( - startRect, margin, bumpDir, savedPositions) { +const bumpPositionRect = function(startRect, margin, bumpDir, savedPositions) { let top = startRect.top; const left = startRect.left; const width = startRect.right - startRect.left; @@ -177,8 +167,7 @@ const bumpPositionRect = function( top = otherEl.bottom + margin; } // Recheck other savedPositions - boundingRect = new Rect( - top, top + height, left, left + width); + boundingRect = new Rect(top, top + height, left, left + width); i = -1; } } From 97d95c87b6eea00b2ac2fe3e6bd9bf4542c8b290 Mon Sep 17 00:00:00 2001 From: kozbial Date: Thu, 29 Jul 2021 14:26:42 -0700 Subject: [PATCH 13/18] Add eslint disable in core/positionable_helpers.js --- core/positionable_helpers.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/core/positionable_helpers.js b/core/positionable_helpers.js index 9e45d5a68..c38ca3263 100644 --- a/core/positionable_helpers.js +++ b/core/positionable_helpers.js @@ -13,10 +13,13 @@ goog.module('Blockly.uiPosition'); goog.module.declareLegacyNamespace(); +/* eslint-disable-next-line no-unused-vars */ const MetricsManager = goog.requireType('Blockly.MetricsManager'); const Rect = goog.require('Blockly.utils.Rect'); const Scrollbar = goog.require('Blockly.Scrollbar'); +/* eslint-disable-next-line no-unused-vars */ const Size = goog.requireType('Blockly.utils.Size'); +/* eslint-disable-next-line no-unused-vars */ const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); const toolbox = goog.require('Blockly.utils.toolbox'); From 5b5b15ccbc898933f1991597ffebbdd77595c01c Mon Sep 17 00:00:00 2001 From: kozbial Date: Fri, 30 Jul 2021 15:53:17 -0700 Subject: [PATCH 14/18] Add extra @package annotation --- core/positionable_helpers.js | 1 - 1 file changed, 1 deletion(-) diff --git a/core/positionable_helpers.js b/core/positionable_helpers.js index c38ca3263..812c5f7be 100644 --- a/core/positionable_helpers.js +++ b/core/positionable_helpers.js @@ -126,7 +126,6 @@ exports.getStartPositionRect = getStartPositionRect; * @param {!WorkspaceSvg} workspace The workspace. * @param {!MetricsManager.UiMetrics} metrics The workspace metrics. * @return {!Position} The suggested corner position. - * @package */ const getCornerOppositeToolbox = function(workspace, metrics) { const leftCorner = From 315e1b856ffa83def33d42eb8a8b87f731d86e14 Mon Sep 17 00:00:00 2001 From: kozbial Date: Thu, 29 Jul 2021 16:03:37 -0700 Subject: [PATCH 15/18] Migrate core/shortcut_items.js to ES6 const/let --- core/shortcut_items.js | 90 +++++++++++++++++++++--------------------- 1 file changed, 45 insertions(+), 45 deletions(-) diff --git a/core/shortcut_items.js b/core/shortcut_items.js index 494b64bfe..6f80f5648 100644 --- a/core/shortcut_items.js +++ b/core/shortcut_items.js @@ -42,12 +42,12 @@ Blockly.ShortcutItems.names = { /** Keyboard shortcut to hide chaff on escape. */ Blockly.ShortcutItems.registerEscape = function() { /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */ - var escapeAction = { + const escapeAction = { name: Blockly.ShortcutItems.names.ESCAPE, - preconditionFn: function(workspace) { + preconditionFn: function (workspace) { return !workspace.options.readOnly; }, - callback: function() { + callback: function () { Blockly.hideChaff(); return true; } @@ -60,14 +60,14 @@ Blockly.ShortcutItems.registerEscape = function() { /** Keyboard shortcut to delete a block on delete or backspace */ Blockly.ShortcutItems.registerDelete = function() { /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */ - var deleteShortcut = { + const deleteShortcut = { name: Blockly.ShortcutItems.names.DELETE, - preconditionFn: function(workspace) { + preconditionFn: function (workspace) { return !workspace.options.readOnly && Blockly.selected && Blockly.selected.isDeletable(); }, - callback: function(workspace, e) { + callback: function (workspace, e) { // Delete or backspace. // Stop the browser from going back to the previous page. // Do this first to prevent an error in the delete code from resulting in @@ -91,16 +91,16 @@ Blockly.ShortcutItems.registerDelete = function() { /** Keyboard shortcut to copy a block on ctrl+c, cmd+c, or alt+c. */ Blockly.ShortcutItems.registerCopy = function() { /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */ - var copyShortcut = { + const copyShortcut = { name: Blockly.ShortcutItems.names.COPY, - preconditionFn: function(workspace) { + preconditionFn: function (workspace) { return !workspace.options.readOnly && - !Blockly.Gesture.inProgress() && - Blockly.selected && - Blockly.selected.isDeletable() && - Blockly.selected.isMovable(); + !Blockly.Gesture.inProgress() && + Blockly.selected && + Blockly.selected.isDeletable() && + Blockly.selected.isMovable(); }, - callback: function(workspace, e) { + callback: function (workspace, e) { // Prevent the default copy behavior, which may beep or otherwise indicate // an error due to the lack of a selection. e.preventDefault(); @@ -111,15 +111,15 @@ Blockly.ShortcutItems.registerCopy = function() { }; Blockly.ShortcutRegistry.registry.register(copyShortcut); - var ctrlC = Blockly.ShortcutRegistry.registry.createSerializedKey( + const ctrlC = Blockly.ShortcutRegistry.registry.createSerializedKey( Blockly.utils.KeyCodes.C, [Blockly.utils.KeyCodes.CTRL]); Blockly.ShortcutRegistry.registry.addKeyMapping(ctrlC, copyShortcut.name); - var altC = Blockly.ShortcutRegistry.registry.createSerializedKey( + const altC = Blockly.ShortcutRegistry.registry.createSerializedKey( Blockly.utils.KeyCodes.C, [Blockly.utils.KeyCodes.ALT]); Blockly.ShortcutRegistry.registry.addKeyMapping(altC, copyShortcut.name); - var metaC = Blockly.ShortcutRegistry.registry.createSerializedKey( + const metaC = Blockly.ShortcutRegistry.registry.createSerializedKey( Blockly.utils.KeyCodes.C, [Blockly.utils.KeyCodes.META]); Blockly.ShortcutRegistry.registry.addKeyMapping(metaC, copyShortcut.name); }; @@ -127,15 +127,15 @@ Blockly.ShortcutItems.registerCopy = function() { /** Keyboard shortcut to copy and delete a block on ctrl+x, cmd+x, or alt+x. */ Blockly.ShortcutItems.registerCut = function() { /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */ - var cutShortcut = { + const cutShortcut = { name: Blockly.ShortcutItems.names.CUT, - preconditionFn: function(workspace) { + preconditionFn: function (workspace) { return !workspace.options.readOnly && - !Blockly.Gesture.inProgress() && - Blockly.selected && - Blockly.selected.isDeletable() && - Blockly.selected.isMovable() && - !Blockly.selected.workspace.isFlyout; + !Blockly.Gesture.inProgress() && + Blockly.selected && + Blockly.selected.isDeletable() && + Blockly.selected.isMovable() && + !Blockly.selected.workspace.isFlyout; }, callback: function() { Blockly.clipboard.copy(/** @type {!Blockly.ICopyable} */ (Blockly.selected)); @@ -146,15 +146,15 @@ Blockly.ShortcutItems.registerCut = function() { Blockly.ShortcutRegistry.registry.register(cutShortcut); - var ctrlX = Blockly.ShortcutRegistry.registry.createSerializedKey( + const ctrlX = Blockly.ShortcutRegistry.registry.createSerializedKey( Blockly.utils.KeyCodes.X, [Blockly.utils.KeyCodes.CTRL]); Blockly.ShortcutRegistry.registry.addKeyMapping(ctrlX, cutShortcut.name); - var altX = Blockly.ShortcutRegistry.registry.createSerializedKey( + const altX = Blockly.ShortcutRegistry.registry.createSerializedKey( Blockly.utils.KeyCodes.X, [Blockly.utils.KeyCodes.ALT]); Blockly.ShortcutRegistry.registry.addKeyMapping(altX, cutShortcut.name); - var metaX = Blockly.ShortcutRegistry.registry.createSerializedKey( + const metaX = Blockly.ShortcutRegistry.registry.createSerializedKey( Blockly.utils.KeyCodes.X, [Blockly.utils.KeyCodes.META]); Blockly.ShortcutRegistry.registry.addKeyMapping(metaX, cutShortcut.name); }; @@ -162,9 +162,9 @@ Blockly.ShortcutItems.registerCut = function() { /** Keyboard shortcut to paste a block on ctrl+v, cmd+v, or alt+v. */ Blockly.ShortcutItems.registerPaste = function() { /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */ - var pasteShortcut = { + const pasteShortcut = { name: Blockly.ShortcutItems.names.PASTE, - preconditionFn: function(workspace) { + preconditionFn: function (workspace) { return !workspace.options.readOnly && !Blockly.Gesture.inProgress(); }, callback: function() { @@ -174,15 +174,15 @@ Blockly.ShortcutItems.registerPaste = function() { Blockly.ShortcutRegistry.registry.register(pasteShortcut); - var ctrlV = Blockly.ShortcutRegistry.registry.createSerializedKey( + const ctrlV = Blockly.ShortcutRegistry.registry.createSerializedKey( Blockly.utils.KeyCodes.V, [Blockly.utils.KeyCodes.CTRL]); Blockly.ShortcutRegistry.registry.addKeyMapping(ctrlV, pasteShortcut.name); - var altV = Blockly.ShortcutRegistry.registry.createSerializedKey( + const altV = Blockly.ShortcutRegistry.registry.createSerializedKey( Blockly.utils.KeyCodes.V, [Blockly.utils.KeyCodes.ALT]); Blockly.ShortcutRegistry.registry.addKeyMapping(altV, pasteShortcut.name); - var metaV = Blockly.ShortcutRegistry.registry.createSerializedKey( + const metaV = Blockly.ShortcutRegistry.registry.createSerializedKey( Blockly.utils.KeyCodes.V, [Blockly.utils.KeyCodes.META]); Blockly.ShortcutRegistry.registry.addKeyMapping(metaV, pasteShortcut.name); }; @@ -190,13 +190,13 @@ Blockly.ShortcutItems.registerPaste = function() { /** Keyboard shortcut to undo the previous action on ctrl+z, cmd+z, or alt+z. */ Blockly.ShortcutItems.registerUndo = function() { /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */ - var undoShortcut = { + const undoShortcut = { name: Blockly.ShortcutItems.names.UNDO, - preconditionFn: function(workspace) { + preconditionFn: function (workspace) { return !workspace.options.readOnly && - !Blockly.Gesture.inProgress(); + !Blockly.Gesture.inProgress(); }, - callback: function(workspace) { + callback: function (workspace) { // 'z' for undo 'Z' is for redo. Blockly.hideChaff(); workspace.undo(false); @@ -205,15 +205,15 @@ Blockly.ShortcutItems.registerUndo = function() { }; Blockly.ShortcutRegistry.registry.register(undoShortcut); - var ctrlZ = Blockly.ShortcutRegistry.registry.createSerializedKey( + const ctrlZ = Blockly.ShortcutRegistry.registry.createSerializedKey( Blockly.utils.KeyCodes.Z, [Blockly.utils.KeyCodes.CTRL]); Blockly.ShortcutRegistry.registry.addKeyMapping(ctrlZ, undoShortcut.name); - var altZ = Blockly.ShortcutRegistry.registry.createSerializedKey( + const altZ = Blockly.ShortcutRegistry.registry.createSerializedKey( Blockly.utils.KeyCodes.Z, [Blockly.utils.KeyCodes.ALT]); Blockly.ShortcutRegistry.registry.addKeyMapping(altZ, undoShortcut.name); - var metaZ = Blockly.ShortcutRegistry.registry.createSerializedKey( + const metaZ = Blockly.ShortcutRegistry.registry.createSerializedKey( Blockly.utils.KeyCodes.Z, [Blockly.utils.KeyCodes.META]); Blockly.ShortcutRegistry.registry.addKeyMapping(metaZ, undoShortcut.name); }; @@ -221,12 +221,12 @@ Blockly.ShortcutItems.registerUndo = function() { /** Keyboard shortcut to redo the previous action on ctrl+shift+z, cmd+shift+z, or alt+shift+z. */ Blockly.ShortcutItems.registerRedo = function() { /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */ - var redoShortcut = { + const redoShortcut = { name: Blockly.ShortcutItems.names.REDO, - preconditionFn: function(workspace) { + preconditionFn: function (workspace) { return !Blockly.Gesture.inProgress() && !workspace.options.readOnly; }, - callback: function(workspace) { + callback: function (workspace) { // 'z' for undo 'Z' is for redo. Blockly.hideChaff(); workspace.undo(true); @@ -235,25 +235,25 @@ Blockly.ShortcutItems.registerRedo = function() { }; Blockly.ShortcutRegistry.registry.register(redoShortcut); - var ctrlShiftZ = Blockly.ShortcutRegistry.registry.createSerializedKey( + const ctrlShiftZ = Blockly.ShortcutRegistry.registry.createSerializedKey( Blockly.utils.KeyCodes.Z, [Blockly.utils.KeyCodes.SHIFT, Blockly.utils.KeyCodes.CTRL]); Blockly.ShortcutRegistry.registry.addKeyMapping( ctrlShiftZ, redoShortcut.name); - var altShiftZ = Blockly.ShortcutRegistry.registry.createSerializedKey( + const altShiftZ = Blockly.ShortcutRegistry.registry.createSerializedKey( Blockly.utils.KeyCodes.Z, [Blockly.utils.KeyCodes.SHIFT, Blockly.utils.KeyCodes.ALT]); Blockly.ShortcutRegistry.registry.addKeyMapping(altShiftZ, redoShortcut.name); - var metaShiftZ = Blockly.ShortcutRegistry.registry.createSerializedKey( + const metaShiftZ = Blockly.ShortcutRegistry.registry.createSerializedKey( Blockly.utils.KeyCodes.Z, [Blockly.utils.KeyCodes.SHIFT, Blockly.utils.KeyCodes.META]); Blockly.ShortcutRegistry.registry.addKeyMapping( metaShiftZ, redoShortcut.name); // Ctrl-y is redo in Windows. Command-y is never valid on Macs. - var ctrlY = Blockly.ShortcutRegistry.registry.createSerializedKey( + const ctrlY = Blockly.ShortcutRegistry.registry.createSerializedKey( Blockly.utils.KeyCodes.Y, [Blockly.utils.KeyCodes.CTRL]); Blockly.ShortcutRegistry.registry.addKeyMapping(ctrlY, redoShortcut.name); }; From 318fa4c014f1131a74e256aff0fa0b4e4fc37f3c Mon Sep 17 00:00:00 2001 From: kozbial Date: Thu, 29 Jul 2021 16:05:12 -0700 Subject: [PATCH 16/18] Migrate core/shortcut_items.js to goog.module --- core/shortcut_items.js | 67 +++++++++++++++++++++++------------------- tests/deps.js | 2 +- 2 files changed, 38 insertions(+), 31 deletions(-) diff --git a/core/shortcut_items.js b/core/shortcut_items.js index 6f80f5648..0a99e1259 100644 --- a/core/shortcut_items.js +++ b/core/shortcut_items.js @@ -10,12 +10,10 @@ */ 'use strict'; -/** - * @name Blockly.ShortcutItems - * @namespace - */ -goog.provide('Blockly.ShortcutItems'); +goog.module('Blockly.ShortcutItems'); +goog.module.declareLegacyNamespace(); +goog.require('Blockly'); goog.require('Blockly.clipboard'); goog.require('Blockly.Gesture'); goog.require('Blockly.ShortcutRegistry'); @@ -29,7 +27,7 @@ goog.requireType('Blockly.ICopyable'); * Object holding the names of the default shortcut items. * @enum {string} */ -Blockly.ShortcutItems.names = { +const names = { ESCAPE: 'escape', DELETE: 'delete', COPY: 'copy', @@ -38,12 +36,13 @@ Blockly.ShortcutItems.names = { UNDO: 'undo', REDO: 'redo' }; +exports.names = names; /** Keyboard shortcut to hide chaff on escape. */ -Blockly.ShortcutItems.registerEscape = function() { +const registerEscape = function() { /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */ const escapeAction = { - name: Blockly.ShortcutItems.names.ESCAPE, + name: names.ESCAPE, preconditionFn: function (workspace) { return !workspace.options.readOnly; }, @@ -56,12 +55,13 @@ Blockly.ShortcutItems.registerEscape = function() { Blockly.ShortcutRegistry.registry.addKeyMapping( Blockly.utils.KeyCodes.ESC, escapeAction.name); }; +exports.registerEscape = registerEscape; /** Keyboard shortcut to delete a block on delete or backspace */ -Blockly.ShortcutItems.registerDelete = function() { +const registerDelete = function() { /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */ const deleteShortcut = { - name: Blockly.ShortcutItems.names.DELETE, + name: names.DELETE, preconditionFn: function (workspace) { return !workspace.options.readOnly && Blockly.selected && @@ -87,12 +87,13 @@ Blockly.ShortcutItems.registerDelete = function() { Blockly.ShortcutRegistry.registry.addKeyMapping( Blockly.utils.KeyCodes.BACKSPACE, deleteShortcut.name); }; +exports.registerDelete = registerDelete; /** Keyboard shortcut to copy a block on ctrl+c, cmd+c, or alt+c. */ -Blockly.ShortcutItems.registerCopy = function() { +const registerCopy = function() { /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */ const copyShortcut = { - name: Blockly.ShortcutItems.names.COPY, + name: names.COPY, preconditionFn: function (workspace) { return !workspace.options.readOnly && !Blockly.Gesture.inProgress() && @@ -123,12 +124,13 @@ Blockly.ShortcutItems.registerCopy = function() { Blockly.utils.KeyCodes.C, [Blockly.utils.KeyCodes.META]); Blockly.ShortcutRegistry.registry.addKeyMapping(metaC, copyShortcut.name); }; +exports.registerCopy = registerCopy; /** Keyboard shortcut to copy and delete a block on ctrl+x, cmd+x, or alt+x. */ -Blockly.ShortcutItems.registerCut = function() { +const registerCut = function() { /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */ const cutShortcut = { - name: Blockly.ShortcutItems.names.CUT, + name: names.CUT, preconditionFn: function (workspace) { return !workspace.options.readOnly && !Blockly.Gesture.inProgress() && @@ -158,12 +160,13 @@ Blockly.ShortcutItems.registerCut = function() { Blockly.utils.KeyCodes.X, [Blockly.utils.KeyCodes.META]); Blockly.ShortcutRegistry.registry.addKeyMapping(metaX, cutShortcut.name); }; +exports.registerCut = registerCut; /** Keyboard shortcut to paste a block on ctrl+v, cmd+v, or alt+v. */ -Blockly.ShortcutItems.registerPaste = function() { +const registerPaste = function() { /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */ const pasteShortcut = { - name: Blockly.ShortcutItems.names.PASTE, + name: names.PASTE, preconditionFn: function (workspace) { return !workspace.options.readOnly && !Blockly.Gesture.inProgress(); }, @@ -186,12 +189,13 @@ Blockly.ShortcutItems.registerPaste = function() { Blockly.utils.KeyCodes.V, [Blockly.utils.KeyCodes.META]); Blockly.ShortcutRegistry.registry.addKeyMapping(metaV, pasteShortcut.name); }; +exports.registerPaste = registerPaste; /** Keyboard shortcut to undo the previous action on ctrl+z, cmd+z, or alt+z. */ -Blockly.ShortcutItems.registerUndo = function() { +const registerUndo = function() { /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */ const undoShortcut = { - name: Blockly.ShortcutItems.names.UNDO, + name: names.UNDO, preconditionFn: function (workspace) { return !workspace.options.readOnly && !Blockly.Gesture.inProgress(); @@ -217,12 +221,13 @@ Blockly.ShortcutItems.registerUndo = function() { Blockly.utils.KeyCodes.Z, [Blockly.utils.KeyCodes.META]); Blockly.ShortcutRegistry.registry.addKeyMapping(metaZ, undoShortcut.name); }; +exports.registerUndo = registerUndo; /** Keyboard shortcut to redo the previous action on ctrl+shift+z, cmd+shift+z, or alt+shift+z. */ -Blockly.ShortcutItems.registerRedo = function() { +const registerRedo = function() { /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */ const redoShortcut = { - name: Blockly.ShortcutItems.names.REDO, + name: names.REDO, preconditionFn: function (workspace) { return !Blockly.Gesture.inProgress() && !workspace.options.readOnly; }, @@ -257,20 +262,22 @@ Blockly.ShortcutItems.registerRedo = function() { Blockly.utils.KeyCodes.Y, [Blockly.utils.KeyCodes.CTRL]); Blockly.ShortcutRegistry.registry.addKeyMapping(ctrlY, redoShortcut.name); }; +exports.registerRedo = registerRedo; /** * Registers all default keyboard shortcut item. This should be called once per instance of * KeyboardShortcutRegistry. - * @package */ -Blockly.ShortcutItems.registerDefaultShortcuts = function() { - Blockly.ShortcutItems.registerEscape(); - Blockly.ShortcutItems.registerDelete(); - Blockly.ShortcutItems.registerCopy(); - Blockly.ShortcutItems.registerCut(); - Blockly.ShortcutItems.registerPaste(); - Blockly.ShortcutItems.registerUndo(); - Blockly.ShortcutItems.registerRedo(); +const registerDefaultShortcuts = function() { + registerEscape(); + registerDelete(); + registerCopy(); + registerCut(); + registerPaste(); + registerUndo(); + registerRedo(); }; +/** @package */ +exports.registerDefaultShortcuts = registerDefaultShortcuts; -Blockly.ShortcutItems.registerDefaultShortcuts(); +registerDefaultShortcuts(); diff --git a/tests/deps.js b/tests/deps.js index e250dc441..0b2e55f2c 100644 --- a/tests/deps.js +++ b/tests/deps.js @@ -162,7 +162,7 @@ goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Ren goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']); goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'}); -goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.clipboard', 'Blockly.utils.KeyCodes']); +goog.addDependency('../../core/shortcut_items.js', ['Blockly.ShortcutItems'], ['Blockly', 'Blockly.Gesture', 'Blockly.ShortcutRegistry', 'Blockly.clipboard', 'Blockly.utils.KeyCodes'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/shortcut_registry.js', ['Blockly.ShortcutRegistry'], ['Blockly.utils.KeyCodes', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/theme.js', ['Blockly.Theme'], ['Blockly.registry', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/theme/classic.js', ['Blockly.Themes.Classic'], ['Blockly.Theme']); From 47ac5548642b3afef730e8a466b0767f563006a0 Mon Sep 17 00:00:00 2001 From: kozbial Date: Mon, 2 Aug 2021 11:17:13 -0700 Subject: [PATCH 17/18] Migrate core/shortcut_items.js named requires --- core/shortcut_items.js | 181 +++++++++++++++++++++-------------------- 1 file changed, 91 insertions(+), 90 deletions(-) diff --git a/core/shortcut_items.js b/core/shortcut_items.js index 0a99e1259..9d622914b 100644 --- a/core/shortcut_items.js +++ b/core/shortcut_items.js @@ -13,14 +13,15 @@ goog.module('Blockly.ShortcutItems'); goog.module.declareLegacyNamespace(); -goog.require('Blockly'); -goog.require('Blockly.clipboard'); -goog.require('Blockly.Gesture'); -goog.require('Blockly.ShortcutRegistry'); -goog.require('Blockly.utils.KeyCodes'); - -goog.requireType('Blockly.BlockSvg'); -goog.requireType('Blockly.ICopyable'); +const Blockly = goog.require('Blockly'); +/* eslint-disable-next-line no-unused-vars */ +const BlockSvg = goog.requireType('Blockly.BlockSvg'); +const Gesture = goog.require('Blockly.Gesture'); +/* eslint-disable-next-line no-unused-vars */ +const ICopyable = goog.requireType('Blockly.ICopyable'); +const KeyCodes = goog.require('Blockly.utils.KeyCodes'); +const ShortcutRegistry = goog.require('Blockly.ShortcutRegistry'); +const clipboard = goog.require('Blockly.clipboard'); /** @@ -40,7 +41,7 @@ exports.names = names; /** Keyboard shortcut to hide chaff on escape. */ const registerEscape = function() { - /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */ + /** @type {!ShortcutRegistry.KeyboardShortcut} */ const escapeAction = { name: names.ESCAPE, preconditionFn: function (workspace) { @@ -51,15 +52,15 @@ const registerEscape = function() { return true; } }; - Blockly.ShortcutRegistry.registry.register(escapeAction); - Blockly.ShortcutRegistry.registry.addKeyMapping( - Blockly.utils.KeyCodes.ESC, escapeAction.name); + ShortcutRegistry.registry.register(escapeAction); + ShortcutRegistry.registry.addKeyMapping( + KeyCodes.ESC, escapeAction.name); }; exports.registerEscape = registerEscape; /** Keyboard shortcut to delete a block on delete or backspace */ const registerDelete = function() { - /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */ + /** @type {!ShortcutRegistry.KeyboardShortcut} */ const deleteShortcut = { name: names.DELETE, preconditionFn: function (workspace) { @@ -74,29 +75,29 @@ const registerDelete = function() { // data loss. e.preventDefault(); // Don't delete while dragging. Jeez. - if (Blockly.Gesture.inProgress()) { + if (Gesture.inProgress()) { return false; } - Blockly.deleteBlock(/** @type {!Blockly.BlockSvg} */ (Blockly.selected)); + Blockly.deleteBlock(/** @type {!BlockSvg} */ (Blockly.selected)); return true; } }; - Blockly.ShortcutRegistry.registry.register(deleteShortcut); - Blockly.ShortcutRegistry.registry.addKeyMapping( - Blockly.utils.KeyCodes.DELETE, deleteShortcut.name); - Blockly.ShortcutRegistry.registry.addKeyMapping( - Blockly.utils.KeyCodes.BACKSPACE, deleteShortcut.name); + ShortcutRegistry.registry.register(deleteShortcut); + ShortcutRegistry.registry.addKeyMapping( + KeyCodes.DELETE, deleteShortcut.name); + ShortcutRegistry.registry.addKeyMapping( + KeyCodes.BACKSPACE, deleteShortcut.name); }; exports.registerDelete = registerDelete; /** Keyboard shortcut to copy a block on ctrl+c, cmd+c, or alt+c. */ const registerCopy = function() { - /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */ + /** @type {!ShortcutRegistry.KeyboardShortcut} */ const copyShortcut = { name: names.COPY, preconditionFn: function (workspace) { return !workspace.options.readOnly && - !Blockly.Gesture.inProgress() && + !Gesture.inProgress() && Blockly.selected && Blockly.selected.isDeletable() && Blockly.selected.isMovable(); @@ -106,99 +107,99 @@ const registerCopy = function() { // an error due to the lack of a selection. e.preventDefault(); Blockly.hideChaff(); - Blockly.clipboard.copy(/** @type {!Blockly.ICopyable} */ (Blockly.selected)); + clipboard.copy(/** @type {!ICopyable} */ (Blockly.selected)); return true; } }; - Blockly.ShortcutRegistry.registry.register(copyShortcut); + ShortcutRegistry.registry.register(copyShortcut); - const ctrlC = Blockly.ShortcutRegistry.registry.createSerializedKey( - Blockly.utils.KeyCodes.C, [Blockly.utils.KeyCodes.CTRL]); - Blockly.ShortcutRegistry.registry.addKeyMapping(ctrlC, copyShortcut.name); + const ctrlC = ShortcutRegistry.registry.createSerializedKey( + KeyCodes.C, [KeyCodes.CTRL]); + ShortcutRegistry.registry.addKeyMapping(ctrlC, copyShortcut.name); - const altC = Blockly.ShortcutRegistry.registry.createSerializedKey( - Blockly.utils.KeyCodes.C, [Blockly.utils.KeyCodes.ALT]); - Blockly.ShortcutRegistry.registry.addKeyMapping(altC, copyShortcut.name); + const altC = ShortcutRegistry.registry.createSerializedKey( + KeyCodes.C, [KeyCodes.ALT]); + ShortcutRegistry.registry.addKeyMapping(altC, copyShortcut.name); - const metaC = Blockly.ShortcutRegistry.registry.createSerializedKey( - Blockly.utils.KeyCodes.C, [Blockly.utils.KeyCodes.META]); - Blockly.ShortcutRegistry.registry.addKeyMapping(metaC, copyShortcut.name); + const metaC = ShortcutRegistry.registry.createSerializedKey( + KeyCodes.C, [KeyCodes.META]); + ShortcutRegistry.registry.addKeyMapping(metaC, copyShortcut.name); }; exports.registerCopy = registerCopy; /** Keyboard shortcut to copy and delete a block on ctrl+x, cmd+x, or alt+x. */ const registerCut = function() { - /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */ + /** @type {!ShortcutRegistry.KeyboardShortcut} */ const cutShortcut = { name: names.CUT, preconditionFn: function (workspace) { return !workspace.options.readOnly && - !Blockly.Gesture.inProgress() && + !Gesture.inProgress() && Blockly.selected && Blockly.selected.isDeletable() && Blockly.selected.isMovable() && !Blockly.selected.workspace.isFlyout; }, callback: function() { - Blockly.clipboard.copy(/** @type {!Blockly.ICopyable} */ (Blockly.selected)); - Blockly.deleteBlock(/** @type {!Blockly.BlockSvg} */ (Blockly.selected)); + clipboard.copy(/** @type {!ICopyable} */ (Blockly.selected)); + Blockly.deleteBlock(/** @type {!BlockSvg} */ (Blockly.selected)); return true; } }; - Blockly.ShortcutRegistry.registry.register(cutShortcut); + ShortcutRegistry.registry.register(cutShortcut); - const ctrlX = Blockly.ShortcutRegistry.registry.createSerializedKey( - Blockly.utils.KeyCodes.X, [Blockly.utils.KeyCodes.CTRL]); - Blockly.ShortcutRegistry.registry.addKeyMapping(ctrlX, cutShortcut.name); + const ctrlX = ShortcutRegistry.registry.createSerializedKey( + KeyCodes.X, [KeyCodes.CTRL]); + ShortcutRegistry.registry.addKeyMapping(ctrlX, cutShortcut.name); - const altX = Blockly.ShortcutRegistry.registry.createSerializedKey( - Blockly.utils.KeyCodes.X, [Blockly.utils.KeyCodes.ALT]); - Blockly.ShortcutRegistry.registry.addKeyMapping(altX, cutShortcut.name); + const altX = ShortcutRegistry.registry.createSerializedKey( + KeyCodes.X, [KeyCodes.ALT]); + ShortcutRegistry.registry.addKeyMapping(altX, cutShortcut.name); - const metaX = Blockly.ShortcutRegistry.registry.createSerializedKey( - Blockly.utils.KeyCodes.X, [Blockly.utils.KeyCodes.META]); - Blockly.ShortcutRegistry.registry.addKeyMapping(metaX, cutShortcut.name); + const metaX = ShortcutRegistry.registry.createSerializedKey( + KeyCodes.X, [KeyCodes.META]); + ShortcutRegistry.registry.addKeyMapping(metaX, cutShortcut.name); }; exports.registerCut = registerCut; /** Keyboard shortcut to paste a block on ctrl+v, cmd+v, or alt+v. */ const registerPaste = function() { - /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */ + /** @type {!ShortcutRegistry.KeyboardShortcut} */ const pasteShortcut = { name: names.PASTE, preconditionFn: function (workspace) { - return !workspace.options.readOnly && !Blockly.Gesture.inProgress(); + return !workspace.options.readOnly && !Gesture.inProgress(); }, callback: function() { - return Blockly.clipboard.paste(); + return clipboard.paste(); } }; - Blockly.ShortcutRegistry.registry.register(pasteShortcut); + ShortcutRegistry.registry.register(pasteShortcut); - const ctrlV = Blockly.ShortcutRegistry.registry.createSerializedKey( - Blockly.utils.KeyCodes.V, [Blockly.utils.KeyCodes.CTRL]); - Blockly.ShortcutRegistry.registry.addKeyMapping(ctrlV, pasteShortcut.name); + const ctrlV = ShortcutRegistry.registry.createSerializedKey( + KeyCodes.V, [KeyCodes.CTRL]); + ShortcutRegistry.registry.addKeyMapping(ctrlV, pasteShortcut.name); - const altV = Blockly.ShortcutRegistry.registry.createSerializedKey( - Blockly.utils.KeyCodes.V, [Blockly.utils.KeyCodes.ALT]); - Blockly.ShortcutRegistry.registry.addKeyMapping(altV, pasteShortcut.name); + const altV = ShortcutRegistry.registry.createSerializedKey( + KeyCodes.V, [KeyCodes.ALT]); + ShortcutRegistry.registry.addKeyMapping(altV, pasteShortcut.name); - const metaV = Blockly.ShortcutRegistry.registry.createSerializedKey( - Blockly.utils.KeyCodes.V, [Blockly.utils.KeyCodes.META]); - Blockly.ShortcutRegistry.registry.addKeyMapping(metaV, pasteShortcut.name); + const metaV = ShortcutRegistry.registry.createSerializedKey( + KeyCodes.V, [KeyCodes.META]); + ShortcutRegistry.registry.addKeyMapping(metaV, pasteShortcut.name); }; exports.registerPaste = registerPaste; /** Keyboard shortcut to undo the previous action on ctrl+z, cmd+z, or alt+z. */ const registerUndo = function() { - /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */ + /** @type {!ShortcutRegistry.KeyboardShortcut} */ const undoShortcut = { name: names.UNDO, preconditionFn: function (workspace) { return !workspace.options.readOnly && - !Blockly.Gesture.inProgress(); + !Gesture.inProgress(); }, callback: function (workspace) { // 'z' for undo 'Z' is for redo. @@ -207,29 +208,29 @@ const registerUndo = function() { return true; } }; - Blockly.ShortcutRegistry.registry.register(undoShortcut); + ShortcutRegistry.registry.register(undoShortcut); - const ctrlZ = Blockly.ShortcutRegistry.registry.createSerializedKey( - Blockly.utils.KeyCodes.Z, [Blockly.utils.KeyCodes.CTRL]); - Blockly.ShortcutRegistry.registry.addKeyMapping(ctrlZ, undoShortcut.name); + const ctrlZ = ShortcutRegistry.registry.createSerializedKey( + KeyCodes.Z, [KeyCodes.CTRL]); + ShortcutRegistry.registry.addKeyMapping(ctrlZ, undoShortcut.name); - const altZ = Blockly.ShortcutRegistry.registry.createSerializedKey( - Blockly.utils.KeyCodes.Z, [Blockly.utils.KeyCodes.ALT]); - Blockly.ShortcutRegistry.registry.addKeyMapping(altZ, undoShortcut.name); + const altZ = ShortcutRegistry.registry.createSerializedKey( + KeyCodes.Z, [KeyCodes.ALT]); + ShortcutRegistry.registry.addKeyMapping(altZ, undoShortcut.name); - const metaZ = Blockly.ShortcutRegistry.registry.createSerializedKey( - Blockly.utils.KeyCodes.Z, [Blockly.utils.KeyCodes.META]); - Blockly.ShortcutRegistry.registry.addKeyMapping(metaZ, undoShortcut.name); + const metaZ = ShortcutRegistry.registry.createSerializedKey( + KeyCodes.Z, [KeyCodes.META]); + ShortcutRegistry.registry.addKeyMapping(metaZ, undoShortcut.name); }; exports.registerUndo = registerUndo; /** Keyboard shortcut to redo the previous action on ctrl+shift+z, cmd+shift+z, or alt+shift+z. */ const registerRedo = function() { - /** @type {!Blockly.ShortcutRegistry.KeyboardShortcut} */ + /** @type {!ShortcutRegistry.KeyboardShortcut} */ const redoShortcut = { name: names.REDO, preconditionFn: function (workspace) { - return !Blockly.Gesture.inProgress() && !workspace.options.readOnly; + return !Gesture.inProgress() && !workspace.options.readOnly; }, callback: function (workspace) { // 'z' for undo 'Z' is for redo. @@ -238,29 +239,29 @@ const registerRedo = function() { return true; } }; - Blockly.ShortcutRegistry.registry.register(redoShortcut); + ShortcutRegistry.registry.register(redoShortcut); - const ctrlShiftZ = Blockly.ShortcutRegistry.registry.createSerializedKey( - Blockly.utils.KeyCodes.Z, - [Blockly.utils.KeyCodes.SHIFT, Blockly.utils.KeyCodes.CTRL]); - Blockly.ShortcutRegistry.registry.addKeyMapping( + const ctrlShiftZ = ShortcutRegistry.registry.createSerializedKey( + KeyCodes.Z, + [KeyCodes.SHIFT, KeyCodes.CTRL]); + ShortcutRegistry.registry.addKeyMapping( ctrlShiftZ, redoShortcut.name); - const altShiftZ = Blockly.ShortcutRegistry.registry.createSerializedKey( - Blockly.utils.KeyCodes.Z, - [Blockly.utils.KeyCodes.SHIFT, Blockly.utils.KeyCodes.ALT]); - Blockly.ShortcutRegistry.registry.addKeyMapping(altShiftZ, redoShortcut.name); + const altShiftZ = ShortcutRegistry.registry.createSerializedKey( + KeyCodes.Z, + [KeyCodes.SHIFT, KeyCodes.ALT]); + ShortcutRegistry.registry.addKeyMapping(altShiftZ, redoShortcut.name); - const metaShiftZ = Blockly.ShortcutRegistry.registry.createSerializedKey( - Blockly.utils.KeyCodes.Z, - [Blockly.utils.KeyCodes.SHIFT, Blockly.utils.KeyCodes.META]); - Blockly.ShortcutRegistry.registry.addKeyMapping( + const metaShiftZ = ShortcutRegistry.registry.createSerializedKey( + KeyCodes.Z, + [KeyCodes.SHIFT, KeyCodes.META]); + ShortcutRegistry.registry.addKeyMapping( metaShiftZ, redoShortcut.name); // Ctrl-y is redo in Windows. Command-y is never valid on Macs. - const ctrlY = Blockly.ShortcutRegistry.registry.createSerializedKey( - Blockly.utils.KeyCodes.Y, [Blockly.utils.KeyCodes.CTRL]); - Blockly.ShortcutRegistry.registry.addKeyMapping(ctrlY, redoShortcut.name); + const ctrlY = ShortcutRegistry.registry.createSerializedKey( + KeyCodes.Y, [KeyCodes.CTRL]); + ShortcutRegistry.registry.addKeyMapping(ctrlY, redoShortcut.name); }; exports.registerRedo = registerRedo; From d11071999ef317a289e0188ae3daa01746cbd458 Mon Sep 17 00:00:00 2001 From: kozbial Date: Mon, 2 Aug 2021 11:17:20 -0700 Subject: [PATCH 18/18] clang-format core/shortcut_items.js --- core/shortcut_items.js | 91 +++++++++++++++++++----------------------- 1 file changed, 40 insertions(+), 51 deletions(-) diff --git a/core/shortcut_items.js b/core/shortcut_items.js index 9d622914b..259a8c4bc 100644 --- a/core/shortcut_items.js +++ b/core/shortcut_items.js @@ -44,17 +44,16 @@ const registerEscape = function() { /** @type {!ShortcutRegistry.KeyboardShortcut} */ const escapeAction = { name: names.ESCAPE, - preconditionFn: function (workspace) { + preconditionFn: function(workspace) { return !workspace.options.readOnly; }, - callback: function () { + callback: function() { Blockly.hideChaff(); return true; } }; ShortcutRegistry.registry.register(escapeAction); - ShortcutRegistry.registry.addKeyMapping( - KeyCodes.ESC, escapeAction.name); + ShortcutRegistry.registry.addKeyMapping(KeyCodes.ESC, escapeAction.name); }; exports.registerEscape = registerEscape; @@ -63,12 +62,11 @@ const registerDelete = function() { /** @type {!ShortcutRegistry.KeyboardShortcut} */ const deleteShortcut = { name: names.DELETE, - preconditionFn: function (workspace) { - return !workspace.options.readOnly && - Blockly.selected && + preconditionFn: function(workspace) { + return !workspace.options.readOnly && Blockly.selected && Blockly.selected.isDeletable(); }, - callback: function (workspace, e) { + callback: function(workspace, e) { // Delete or backspace. // Stop the browser from going back to the previous page. // Do this first to prevent an error in the delete code from resulting in @@ -83,8 +81,7 @@ const registerDelete = function() { } }; ShortcutRegistry.registry.register(deleteShortcut); - ShortcutRegistry.registry.addKeyMapping( - KeyCodes.DELETE, deleteShortcut.name); + ShortcutRegistry.registry.addKeyMapping(KeyCodes.DELETE, deleteShortcut.name); ShortcutRegistry.registry.addKeyMapping( KeyCodes.BACKSPACE, deleteShortcut.name); }; @@ -95,14 +92,12 @@ const registerCopy = function() { /** @type {!ShortcutRegistry.KeyboardShortcut} */ const copyShortcut = { name: names.COPY, - preconditionFn: function (workspace) { - return !workspace.options.readOnly && - !Gesture.inProgress() && - Blockly.selected && - Blockly.selected.isDeletable() && + preconditionFn: function(workspace) { + return !workspace.options.readOnly && !Gesture.inProgress() && + Blockly.selected && Blockly.selected.isDeletable() && Blockly.selected.isMovable(); }, - callback: function (workspace, e) { + callback: function(workspace, e) { // Prevent the default copy behavior, which may beep or otherwise indicate // an error due to the lack of a selection. e.preventDefault(); @@ -117,8 +112,8 @@ const registerCopy = function() { KeyCodes.C, [KeyCodes.CTRL]); ShortcutRegistry.registry.addKeyMapping(ctrlC, copyShortcut.name); - const altC = ShortcutRegistry.registry.createSerializedKey( - KeyCodes.C, [KeyCodes.ALT]); + const altC = + ShortcutRegistry.registry.createSerializedKey(KeyCodes.C, [KeyCodes.ALT]); ShortcutRegistry.registry.addKeyMapping(altC, copyShortcut.name); const metaC = ShortcutRegistry.registry.createSerializedKey( @@ -132,13 +127,10 @@ const registerCut = function() { /** @type {!ShortcutRegistry.KeyboardShortcut} */ const cutShortcut = { name: names.CUT, - preconditionFn: function (workspace) { - return !workspace.options.readOnly && - !Gesture.inProgress() && - Blockly.selected && - Blockly.selected.isDeletable() && - Blockly.selected.isMovable() && - !Blockly.selected.workspace.isFlyout; + preconditionFn: function(workspace) { + return !workspace.options.readOnly && !Gesture.inProgress() && + Blockly.selected && Blockly.selected.isDeletable() && + Blockly.selected.isMovable() && !Blockly.selected.workspace.isFlyout; }, callback: function() { clipboard.copy(/** @type {!ICopyable} */ (Blockly.selected)); @@ -153,8 +145,8 @@ const registerCut = function() { KeyCodes.X, [KeyCodes.CTRL]); ShortcutRegistry.registry.addKeyMapping(ctrlX, cutShortcut.name); - const altX = ShortcutRegistry.registry.createSerializedKey( - KeyCodes.X, [KeyCodes.ALT]); + const altX = + ShortcutRegistry.registry.createSerializedKey(KeyCodes.X, [KeyCodes.ALT]); ShortcutRegistry.registry.addKeyMapping(altX, cutShortcut.name); const metaX = ShortcutRegistry.registry.createSerializedKey( @@ -168,7 +160,7 @@ const registerPaste = function() { /** @type {!ShortcutRegistry.KeyboardShortcut} */ const pasteShortcut = { name: names.PASTE, - preconditionFn: function (workspace) { + preconditionFn: function(workspace) { return !workspace.options.readOnly && !Gesture.inProgress(); }, callback: function() { @@ -182,8 +174,8 @@ const registerPaste = function() { KeyCodes.V, [KeyCodes.CTRL]); ShortcutRegistry.registry.addKeyMapping(ctrlV, pasteShortcut.name); - const altV = ShortcutRegistry.registry.createSerializedKey( - KeyCodes.V, [KeyCodes.ALT]); + const altV = + ShortcutRegistry.registry.createSerializedKey(KeyCodes.V, [KeyCodes.ALT]); ShortcutRegistry.registry.addKeyMapping(altV, pasteShortcut.name); const metaV = ShortcutRegistry.registry.createSerializedKey( @@ -197,11 +189,10 @@ const registerUndo = function() { /** @type {!ShortcutRegistry.KeyboardShortcut} */ const undoShortcut = { name: names.UNDO, - preconditionFn: function (workspace) { - return !workspace.options.readOnly && - !Gesture.inProgress(); + preconditionFn: function(workspace) { + return !workspace.options.readOnly && !Gesture.inProgress(); }, - callback: function (workspace) { + callback: function(workspace) { // 'z' for undo 'Z' is for redo. Blockly.hideChaff(); workspace.undo(false); @@ -214,8 +205,8 @@ const registerUndo = function() { KeyCodes.Z, [KeyCodes.CTRL]); ShortcutRegistry.registry.addKeyMapping(ctrlZ, undoShortcut.name); - const altZ = ShortcutRegistry.registry.createSerializedKey( - KeyCodes.Z, [KeyCodes.ALT]); + const altZ = + ShortcutRegistry.registry.createSerializedKey(KeyCodes.Z, [KeyCodes.ALT]); ShortcutRegistry.registry.addKeyMapping(altZ, undoShortcut.name); const metaZ = ShortcutRegistry.registry.createSerializedKey( @@ -224,15 +215,18 @@ const registerUndo = function() { }; exports.registerUndo = registerUndo; -/** Keyboard shortcut to redo the previous action on ctrl+shift+z, cmd+shift+z, or alt+shift+z. */ +/** + * Keyboard shortcut to redo the previous action on ctrl+shift+z, cmd+shift+z, + * or alt+shift+z. + */ const registerRedo = function() { /** @type {!ShortcutRegistry.KeyboardShortcut} */ const redoShortcut = { name: names.REDO, - preconditionFn: function (workspace) { + preconditionFn: function(workspace) { return !Gesture.inProgress() && !workspace.options.readOnly; }, - callback: function (workspace) { + callback: function(workspace) { // 'z' for undo 'Z' is for redo. Blockly.hideChaff(); workspace.undo(true); @@ -242,21 +236,16 @@ const registerRedo = function() { ShortcutRegistry.registry.register(redoShortcut); const ctrlShiftZ = ShortcutRegistry.registry.createSerializedKey( - KeyCodes.Z, - [KeyCodes.SHIFT, KeyCodes.CTRL]); - ShortcutRegistry.registry.addKeyMapping( - ctrlShiftZ, redoShortcut.name); + KeyCodes.Z, [KeyCodes.SHIFT, KeyCodes.CTRL]); + ShortcutRegistry.registry.addKeyMapping(ctrlShiftZ, redoShortcut.name); const altShiftZ = ShortcutRegistry.registry.createSerializedKey( - KeyCodes.Z, - [KeyCodes.SHIFT, KeyCodes.ALT]); + KeyCodes.Z, [KeyCodes.SHIFT, KeyCodes.ALT]); ShortcutRegistry.registry.addKeyMapping(altShiftZ, redoShortcut.name); const metaShiftZ = ShortcutRegistry.registry.createSerializedKey( - KeyCodes.Z, - [KeyCodes.SHIFT, KeyCodes.META]); - ShortcutRegistry.registry.addKeyMapping( - metaShiftZ, redoShortcut.name); + KeyCodes.Z, [KeyCodes.SHIFT, KeyCodes.META]); + ShortcutRegistry.registry.addKeyMapping(metaShiftZ, redoShortcut.name); // Ctrl-y is redo in Windows. Command-y is never valid on Macs. const ctrlY = ShortcutRegistry.registry.createSerializedKey( @@ -266,8 +255,8 @@ const registerRedo = function() { exports.registerRedo = registerRedo; /** - * Registers all default keyboard shortcut item. This should be called once per instance of - * KeyboardShortcutRegistry. + * Registers all default keyboard shortcut item. This should be called once per + * instance of KeyboardShortcutRegistry. */ const registerDefaultShortcuts = function() { registerEscape();