diff --git a/core/block.js b/core/block.js index 5daad64b5..afbc86742 100644 --- a/core/block.js +++ b/core/block.js @@ -2155,4 +2155,4 @@ Block.prototype.toDevString = function() { return msg; }; -exports = Block; +exports.Block = Block; diff --git a/core/block_animations.js b/core/block_animations.js index 0d9971910..ea8999a84 100644 --- a/core/block_animations.js +++ b/core/block_animations.js @@ -12,10 +12,10 @@ goog.module('Blockly.blockAnimations'); -/* eslint-disable-next-line no-unused-vars */ -const BlockSvg = goog.requireType('Blockly.BlockSvg'); const Svg = goog.require('Blockly.utils.Svg'); const dom = goog.require('Blockly.utils.dom'); +/* eslint-disable-next-line no-unused-vars */ +const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); /** diff --git a/core/block_drag_surface.js b/core/block_drag_surface.js index 83d63fd10..9cea21c39 100644 --- a/core/block_drag_surface.js +++ b/core/block_drag_surface.js @@ -256,4 +256,4 @@ BlockDragSurfaceSvg.prototype.clearAndHide = function(opt_newSurface) { this.surfaceXY_ = null; }; -exports = BlockDragSurfaceSvg; +exports.BlockDragSurfaceSvg = BlockDragSurfaceSvg; diff --git a/core/block_dragger.js b/core/block_dragger.js index 221ff53b9..650cf4a88 100644 --- a/core/block_dragger.js +++ b/core/block_dragger.js @@ -12,8 +12,6 @@ goog.module('Blockly.BlockDragger'); -/* eslint-disable-next-line no-unused-vars */ -const BlockSvg = goog.requireType('Blockly.BlockSvg'); const Coordinate = goog.require('Blockly.utils.Coordinate'); /* eslint-disable-next-line no-unused-vars */ const IBlockDragger = goog.requireType('Blockly.IBlockDragger'); @@ -28,6 +26,8 @@ const common = goog.require('Blockly.common'); const dom = goog.require('Blockly.utils.dom'); const events = goog.require('Blockly.Events'); const registry = goog.require('Blockly.registry'); +/* eslint-disable-next-line no-unused-vars */ +const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.BlockDrag'); /** @suppress {extraRequire} */ @@ -468,4 +468,4 @@ BlockDragger.prototype.getInsertionMarkers = function() { registry.register(registry.Type.BLOCK_DRAGGER, registry.DEFAULT, BlockDragger); -exports = BlockDragger; +exports.BlockDragger = BlockDragger; diff --git a/core/block_svg.js b/core/block_svg.js index 26353fb1f..26166ac61 100644 --- a/core/block_svg.js +++ b/core/block_svg.js @@ -13,7 +13,6 @@ goog.module('Blockly.BlockSvg'); const ASTNode = goog.require('Blockly.ASTNode'); -const Block = goog.require('Blockly.Block'); /* eslint-disable-next-line no-unused-vars */ const BlockRenderingDebug = goog.requireType('Blockly.blockRendering.Debug'); /* eslint-disable-next-line no-unused-vars */ @@ -67,6 +66,7 @@ const internalConstants = goog.require('Blockly.internalConstants'); const object = goog.require('Blockly.utils.object'); const userAgent = goog.require('Blockly.utils.userAgent'); const utils = goog.require('Blockly.utils'); +const {Block} = goog.require('Blockly.Block'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.BlockMove'); /** @suppress {extraRequire} */ @@ -1775,4 +1775,4 @@ BlockSvg.prototype.highlightShapeForInput = function(conn, add) { this.pathObject.updateShapeForInputHighlight(conn, add); }; -exports = BlockSvg; +exports.BlockSvg = BlockSvg; diff --git a/core/blockly.js b/core/blockly.js index 63694ec2a..83c246208 100644 --- a/core/blockly.js +++ b/core/blockly.js @@ -19,11 +19,7 @@ goog.module.declareLegacyNamespace(); const ASTNode = goog.require('Blockly.ASTNode'); const BasicCursor = goog.require('Blockly.BasicCursor'); -const Block = goog.require('Blockly.Block'); const Blocks = goog.require('Blockly.Blocks'); -const BlockDragger = goog.require('Blockly.BlockDragger'); -const BlockDragSurfaceSvg = goog.require('Blockly.BlockDragSurfaceSvg'); -const BlockSvg = goog.require('Blockly.BlockSvg'); const Cursor = goog.require('Blockly.Cursor'); /* eslint-disable-next-line no-unused-vars */ const ICopyable = goog.requireType('Blockly.ICopyable'); @@ -45,6 +41,10 @@ const dialog = goog.require('Blockly.dialog'); const inputTypes = goog.require('Blockly.inputTypes'); const internalConstants = goog.require('Blockly.internalConstants'); const toolbox = goog.require('Blockly.utils.toolbox'); +const {Block} = goog.require('Blockly.Block'); +const {BlockDragger} = goog.require('Blockly.BlockDragger'); +const {BlockDragSurfaceSvg} = goog.require('Blockly.BlockDragSurfaceSvg'); +const {BlockSvg} = goog.require('Blockly.BlockSvg'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.BlockCreate'); /** @suppress {extraRequire} */ diff --git a/core/bubble.js b/core/bubble.js index 6f0b93a03..ad72c9e9b 100644 --- a/core/bubble.js +++ b/core/bubble.js @@ -13,10 +13,6 @@ goog.module('Blockly.Bubble'); goog.module.declareLegacyNamespace(); -/* eslint-disable-next-line no-unused-vars */ -const BlockDragSurfaceSvg = goog.requireType('Blockly.BlockDragSurfaceSvg'); -/* eslint-disable-next-line no-unused-vars */ -const BlockSvg = goog.requireType('Blockly.BlockSvg'); const Coordinate = goog.require('Blockly.utils.Coordinate'); /* eslint-disable-next-line no-unused-vars */ const IBubble = goog.requireType('Blockly.IBubble'); @@ -32,6 +28,10 @@ const browserEvents = goog.require('Blockly.browserEvents'); const dom = goog.require('Blockly.utils.dom'); const math = goog.require('Blockly.utils.math'); const userAgent = goog.require('Blockly.utils.userAgent'); +/* eslint-disable-next-line no-unused-vars */ +const {BlockDragSurfaceSvg} = goog.requireType('Blockly.BlockDragSurfaceSvg'); +/* eslint-disable-next-line no-unused-vars */ +const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); /** @suppress {extraRequire} */ goog.require('Blockly.Workspace'); diff --git a/core/bubble_dragger.js b/core/bubble_dragger.js index d879e4748..736332f6f 100644 --- a/core/bubble_dragger.js +++ b/core/bubble_dragger.js @@ -13,8 +13,6 @@ goog.module('Blockly.BubbleDragger'); goog.module.declareLegacyNamespace(); -/* eslint-disable-next-line no-unused-vars */ -const BlockDragSurfaceSvg = goog.requireType('Blockly.BlockDragSurfaceSvg'); const ComponentManager = goog.require('Blockly.ComponentManager'); const Coordinate = goog.require('Blockly.utils.Coordinate'); const Events = goog.require('Blockly.Events'); @@ -29,6 +27,8 @@ const WorkspaceCommentSvg = goog.requireType('Blockly.WorkspaceCommentSvg'); /* eslint-disable-next-line no-unused-vars */ const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); const utils = goog.require('Blockly.utils'); +/* eslint-disable-next-line no-unused-vars */ +const {BlockDragSurfaceSvg} = goog.requireType('Blockly.BlockDragSurfaceSvg'); /** @suppress {extraRequire} */ goog.require('Blockly.Bubble'); /** @suppress {extraRequire} */ diff --git a/core/bump_objects.js b/core/bump_objects.js index 4c53356dc..200e2d0d2 100644 --- a/core/bump_objects.js +++ b/core/bump_objects.js @@ -12,8 +12,6 @@ goog.module('Blockly.bumpObjects'); -/* eslint-disable-next-line no-unused-vars */ -const BlockSvg = goog.requireType('Blockly.BlockSvg'); /* eslint-disable-next-line no-unused-vars */ const Events = goog.require('Blockly.Events'); /* eslint-disable-next-line no-unused-vars */ @@ -25,6 +23,8 @@ const WorkspaceCommentSvg = goog.requireType('Blockly.WorkspaceCommentSvg'); /* eslint-disable-next-line no-unused-vars */ const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); const mathUtils = goog.require('Blockly.utils.math'); +/* eslint-disable-next-line no-unused-vars */ +const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); /** diff --git a/core/comment.js b/core/comment.js index b126aaf57..6c7d050f6 100644 --- a/core/comment.js +++ b/core/comment.js @@ -13,10 +13,6 @@ goog.module('Blockly.Comment'); goog.module.declareLegacyNamespace(); -/* eslint-disable-next-line no-unused-vars */ -const Block = goog.requireType('Blockly.Block'); -/* eslint-disable-next-line no-unused-vars */ -const BlockSvg = goog.requireType('Blockly.BlockSvg'); const Bubble = goog.require('Blockly.Bubble'); /* eslint-disable-next-line no-unused-vars */ const Coordinate = goog.requireType('Blockly.utils.Coordinate'); @@ -32,6 +28,10 @@ const browserEvents = goog.require('Blockly.browserEvents'); const dom = goog.require('Blockly.utils.dom'); const object = goog.require('Blockly.utils.object'); const userAgent = goog.require('Blockly.utils.userAgent'); +/* eslint-disable-next-line no-unused-vars */ +const {Block} = goog.requireType('Blockly.Block'); +/* eslint-disable-next-line no-unused-vars */ +const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.BlockChange'); /** @suppress {extraRequire} */ diff --git a/core/connection.js b/core/connection.js index 67d4eb5c8..fc01edebc 100644 --- a/core/connection.js +++ b/core/connection.js @@ -13,8 +13,6 @@ goog.module('Blockly.Connection'); goog.module.declareLegacyNamespace(); -/* eslint-disable-next-line no-unused-vars */ -const Block = goog.requireType('Blockly.Block'); const Events = goog.require('Blockly.Events'); /* eslint-disable-next-line no-unused-vars */ const IASTNodeLocationWithBlock = goog.requireType('Blockly.IASTNodeLocationWithBlock'); @@ -26,6 +24,8 @@ const Xml = goog.require('Blockly.Xml'); const blocks = goog.require('Blockly.serialization.blocks'); const connectionTypes = goog.require('Blockly.connectionTypes'); const deprecation = goog.require('Blockly.utils.deprecation'); +/* eslint-disable-next-line no-unused-vars */ +const {Block} = goog.requireType('Blockly.Block'); /** @suppress {extraRequire} */ goog.require('Blockly.constants'); /** @suppress {extraRequire} */ @@ -767,7 +767,7 @@ Connection.prototype.createShadowBlock_ = function(attemptToConnect) { }); return blockShadow; } - + if (shadowDom) { blockShadow = Xml.domToBlock(shadowDom, parentBlock.workspace); if (attemptToConnect) { diff --git a/core/contextmenu.js b/core/contextmenu.js index 82dbdb6ff..5afc69172 100644 --- a/core/contextmenu.js +++ b/core/contextmenu.js @@ -16,8 +16,6 @@ goog.module.declareLegacyNamespace(); // TODO(#5073): Add Blockly require after fixing circular dependency. // goog.require('Blockly'); /* eslint-disable-next-line no-unused-vars */ -const Block = goog.requireType('Blockly.Block'); -/* eslint-disable-next-line no-unused-vars */ const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); const Coordinate = goog.require('Blockly.utils.Coordinate'); const Events = goog.require('Blockly.Events'); @@ -36,6 +34,8 @@ const internalConstants = goog.require('Blockly.internalConstants'); const userAgent = goog.require('Blockly.utils.userAgent'); const utils = goog.require('Blockly.utils'); /* eslint-disable-next-line no-unused-vars */ +const {Block} = goog.requireType('Blockly.Block'); +/* eslint-disable-next-line no-unused-vars */ const WorkspaceCommentSvg = goog.requireType('Blockly.WorkspaceCommentSvg'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.BlockCreate'); diff --git a/core/contextmenu_items.js b/core/contextmenu_items.js index 0e38129dc..3e32c2ca0 100644 --- a/core/contextmenu_items.js +++ b/core/contextmenu_items.js @@ -13,8 +13,6 @@ goog.module('Blockly.ContextMenuItems'); goog.module.declareLegacyNamespace(); -/* eslint-disable-next-line no-unused-vars */ -const BlockSvg = goog.requireType('Blockly.BlockSvg'); const ContextMenuRegistry = goog.require('Blockly.ContextMenuRegistry'); const Events = goog.require('Blockly.Events'); const Msg = goog.require('Blockly.Msg'); @@ -25,6 +23,8 @@ const dialog = goog.require('Blockly.dialog'); const idGenerator = goog.require('Blockly.utils.idGenerator'); const inputTypes = goog.require('Blockly.inputTypes'); const userAgent = goog.require('Blockly.utils.userAgent'); +/* eslint-disable-next-line no-unused-vars */ +const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); /** Option to undo previous action. */ diff --git a/core/contextmenu_registry.js b/core/contextmenu_registry.js index a97dc30f4..918a11bd6 100644 --- a/core/contextmenu_registry.js +++ b/core/contextmenu_registry.js @@ -17,10 +17,10 @@ goog.module('Blockly.ContextMenuRegistry'); goog.module.declareLegacyNamespace(); -/* eslint-disable-next-line no-unused-vars */ -const BlockSvg = goog.requireType('Blockly.BlockSvg'); /* eslint-disable-next-line no-unused-vars */ const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); +/* eslint-disable-next-line no-unused-vars */ +const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); /** diff --git a/core/delete_area.js b/core/delete_area.js index 6dbe50db6..9ca08bc7b 100644 --- a/core/delete_area.js +++ b/core/delete_area.js @@ -15,13 +15,14 @@ goog.module('Blockly.DeleteArea'); goog.module.declareLegacyNamespace(); -const BlockSvg = goog.require('Blockly.BlockSvg'); const DragTarget = goog.require('Blockly.DragTarget'); /* eslint-disable-next-line no-unused-vars */ const IDeleteArea = goog.requireType('Blockly.IDeleteArea'); /* eslint-disable-next-line no-unused-vars */ const IDraggable = goog.requireType('Blockly.IDraggable'); const object = goog.require('Blockly.utils.object'); +const {BlockSvg} = goog.require('Blockly.BlockSvg'); + /** * Abstract class for a component that can delete a block or bubble that is diff --git a/core/dropdowndiv.js b/core/dropdowndiv.js index a59017a90..b9d814891 100644 --- a/core/dropdowndiv.js +++ b/core/dropdowndiv.js @@ -16,8 +16,6 @@ goog.module('Blockly.DropDownDiv'); goog.module.declareLegacyNamespace(); -/* eslint-disable-next-line no-unused-vars */ -const BlockSvg = goog.requireType('Blockly.BlockSvg'); const Rect = goog.require('Blockly.utils.Rect'); /* eslint-disable-next-line no-unused-vars */ const Field = goog.requireType('Blockly.Field'); @@ -29,6 +27,8 @@ const common = goog.require('Blockly.common'); const dom = goog.require('Blockly.utils.dom'); const math = goog.require('Blockly.utils.math'); const style = goog.require('Blockly.utils.style'); +/* eslint-disable-next-line no-unused-vars */ +const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); /** diff --git a/core/events/events.js b/core/events/events.js index ef7d3cfcb..996391ee8 100644 --- a/core/events/events.js +++ b/core/events/events.js @@ -20,8 +20,6 @@ goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const Abstract = goog.requireType('Blockly.Events.Abstract'); /* eslint-disable-next-line no-unused-vars */ -const Block = goog.requireType('Blockly.Block'); -/* eslint-disable-next-line no-unused-vars */ const BlockCreate = goog.requireType('Blockly.Events.BlockCreate'); /* eslint-disable-next-line no-unused-vars */ const BlockMove = goog.requireType('Blockly.Events.BlockMove'); @@ -34,6 +32,8 @@ const Workspace = goog.requireType('Blockly.Workspace'); const deprecation = goog.require('Blockly.utils.deprecation'); const idGenerator = goog.require('Blockly.utils.idGenerator'); const registry = goog.require('Blockly.registry'); +/* eslint-disable-next-line no-unused-vars */ +const {Block} = goog.requireType('Blockly.Block'); /** diff --git a/core/events/events_block_base.js b/core/events/events_block_base.js index 1f22a4ed8..96cf24dc3 100644 --- a/core/events/events_block_base.js +++ b/core/events/events_block_base.js @@ -14,9 +14,9 @@ goog.module('Blockly.Events.BlockBase'); goog.module.declareLegacyNamespace(); const Abstract = goog.require('Blockly.Events.Abstract'); -/* eslint-disable-next-line no-unused-vars */ -const Block = goog.requireType('Blockly.Block'); const object = goog.require('Blockly.utils.object'); +/* eslint-disable-next-line no-unused-vars */ +const {Block} = goog.requireType('Blockly.Block'); /** diff --git a/core/events/events_block_change.js b/core/events/events_block_change.js index 96afcd862..7934f901d 100644 --- a/core/events/events_block_change.js +++ b/core/events/events_block_change.js @@ -13,14 +13,14 @@ goog.module('Blockly.Events.BlockChange'); goog.module.declareLegacyNamespace(); -/* eslint-disable-next-line no-unused-vars */ -const Block = goog.requireType('Blockly.Block'); -/* eslint-disable-next-line no-unused-vars */ -const BlockSvg = goog.requireType('Blockly.BlockSvg'); const Events = goog.require('Blockly.Events'); const Xml = goog.require('Blockly.Xml'); const object = goog.require('Blockly.utils.object'); const registry = goog.require('Blockly.registry'); +/* eslint-disable-next-line no-unused-vars */ +const {Block} = goog.requireType('Blockly.Block'); +/* eslint-disable-next-line no-unused-vars */ +const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); /** diff --git a/core/events/events_block_create.js b/core/events/events_block_create.js index f1ce54da7..a43c2985b 100644 --- a/core/events/events_block_create.js +++ b/core/events/events_block_create.js @@ -13,14 +13,14 @@ goog.module('Blockly.Events.BlockCreate'); goog.module.declareLegacyNamespace(); -/* eslint-disable-next-line no-unused-vars */ -const Block = goog.requireType('Blockly.Block'); const BlockBase = goog.require('Blockly.Events.BlockBase'); const Events = goog.require('Blockly.Events'); const Xml = goog.require('Blockly.Xml'); const blocks = goog.require('Blockly.serialization.blocks'); const object = goog.require('Blockly.utils.object'); const registry = goog.require('Blockly.registry'); +/* eslint-disable-next-line no-unused-vars */ +const {Block} = goog.requireType('Blockly.Block'); /** diff --git a/core/events/events_block_delete.js b/core/events/events_block_delete.js index 0dcf88d42..023023322 100644 --- a/core/events/events_block_delete.js +++ b/core/events/events_block_delete.js @@ -13,14 +13,14 @@ goog.module('Blockly.Events.BlockDelete'); goog.module.declareLegacyNamespace(); -/* eslint-disable-next-line no-unused-vars */ -const Block = goog.requireType('Blockly.Block'); const BlockBase = goog.require('Blockly.Events.BlockBase'); const Events = goog.require('Blockly.Events'); const Xml = goog.require('Blockly.Xml'); const blocks = goog.require('Blockly.serialization.blocks'); const object = goog.require('Blockly.utils.object'); const registry = goog.require('Blockly.registry'); +/* eslint-disable-next-line no-unused-vars */ +const {Block} = goog.requireType('Blockly.Block'); /** diff --git a/core/events/events_block_drag.js b/core/events/events_block_drag.js index 6fd3f0a9f..caef95ba7 100644 --- a/core/events/events_block_drag.js +++ b/core/events/events_block_drag.js @@ -13,12 +13,12 @@ goog.module('Blockly.Events.BlockDrag'); goog.module.declareLegacyNamespace(); -/* 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'); const object = goog.require('Blockly.utils.object'); const registry = goog.require('Blockly.registry'); +/* eslint-disable-next-line no-unused-vars */ +const {Block} = goog.requireType('Blockly.Block'); /** diff --git a/core/events/events_block_move.js b/core/events/events_block_move.js index f026c080b..a160441f5 100644 --- a/core/events/events_block_move.js +++ b/core/events/events_block_move.js @@ -13,14 +13,14 @@ goog.module('Blockly.Events.BlockMove'); goog.module.declareLegacyNamespace(); -/* eslint-disable-next-line no-unused-vars */ -const Block = goog.requireType('Blockly.Block'); const BlockBase = goog.require('Blockly.Events.BlockBase'); const Coordinate = goog.require('Blockly.utils.Coordinate'); const Events = goog.require('Blockly.Events'); const connectionTypes = goog.require('Blockly.connectionTypes'); const object = goog.require('Blockly.utils.object'); const registry = goog.require('Blockly.registry'); +/* eslint-disable-next-line no-unused-vars */ +const {Block} = goog.requireType('Blockly.Block'); /** diff --git a/core/events/events_bubble_open.js b/core/events/events_bubble_open.js index 1e177f33e..5c2718c02 100644 --- a/core/events/events_bubble_open.js +++ b/core/events/events_bubble_open.js @@ -13,12 +13,12 @@ goog.module('Blockly.Events.BubbleOpen'); goog.module.declareLegacyNamespace(); -/* eslint-disable-next-line no-unused-vars */ -const BlockSvg = goog.requireType('Blockly.BlockSvg'); 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'); +/* eslint-disable-next-line no-unused-vars */ +const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); /** diff --git a/core/events/events_click.js b/core/events/events_click.js index 521f87763..3b3ca8ad2 100644 --- a/core/events/events_click.js +++ b/core/events/events_click.js @@ -13,12 +13,12 @@ goog.module('Blockly.Events.Click'); goog.module.declareLegacyNamespace(); -/* 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'); const object = goog.require('Blockly.utils.object'); const registry = goog.require('Blockly.registry'); +/* eslint-disable-next-line no-unused-vars */ +const {Block} = goog.requireType('Blockly.Block'); /** * Class for a click event. diff --git a/core/events/events_marker_move.js b/core/events/events_marker_move.js index 2d0e0957b..d05f84de0 100644 --- a/core/events/events_marker_move.js +++ b/core/events/events_marker_move.js @@ -14,14 +14,14 @@ goog.module('Blockly.Events.MarkerMove'); goog.module.declareLegacyNamespace(); 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'); +/* eslint-disable-next-line no-unused-vars */ +const {Block} = goog.requireType('Blockly.Block'); /** diff --git a/core/events/events_ui.js b/core/events/events_ui.js index 5598f30a0..42a5e9bb6 100644 --- a/core/events/events_ui.js +++ b/core/events/events_ui.js @@ -14,12 +14,12 @@ goog.module('Blockly.Events.Ui'); goog.module.declareLegacyNamespace(); -/* 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'); const object = goog.require('Blockly.utils.object'); const registry = goog.require('Blockly.registry'); +/* eslint-disable-next-line no-unused-vars */ +const {Block} = goog.requireType('Blockly.Block'); /** diff --git a/core/extensions.js b/core/extensions.js index f5da2ed83..ef4e59bf4 100644 --- a/core/extensions.js +++ b/core/extensions.js @@ -20,9 +20,9 @@ goog.module('Blockly.Extensions'); goog.module.declareLegacyNamespace(); -/* eslint-disable-next-line no-unused-vars */ -const Block = goog.requireType('Blockly.Block'); const utils = goog.require('Blockly.utils'); +/* eslint-disable-next-line no-unused-vars */ +const {Block} = goog.requireType('Blockly.Block'); goog.requireType('Blockly.Mutator'); @@ -246,7 +246,7 @@ const checkHasFunctionPair = function(object, name1, name2, errorPrefix) { var has1 = object[name1] !== undefined; var has2 = object[name2] !== undefined; - + if (has1 && has2) { if (typeof object[name1] != 'function') { throw Error(errorPrefix + name1 + ' must be a function.'); diff --git a/core/field.js b/core/field.js index ce55b7c3a..4be8dfd63 100644 --- a/core/field.js +++ b/core/field.js @@ -15,10 +15,6 @@ goog.module('Blockly.Field'); goog.module.declareLegacyNamespace(); -/* eslint-disable-next-line no-unused-vars */ -const Block = goog.requireType('Blockly.Block'); -/* eslint-disable-next-line no-unused-vars */ -const BlockSvg = goog.requireType('Blockly.BlockSvg'); /* eslint-disable-next-line no-unused-vars */ const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); /* eslint-disable-next-line no-unused-vars */ @@ -52,6 +48,10 @@ const style = goog.require('Blockly.utils.style'); const userAgent = goog.require('Blockly.utils.userAgent'); const utils = goog.require('Blockly.utils'); const utilsXml = goog.require('Blockly.utils.xml'); +/* eslint-disable-next-line no-unused-vars */ +const {Block} = goog.requireType('Blockly.Block'); +/* eslint-disable-next-line no-unused-vars */ +const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.BlockChange'); /** @suppress {extraRequire} */ diff --git a/core/field_textinput.js b/core/field_textinput.js index 789bc0a96..eab4de6e0 100644 --- a/core/field_textinput.js +++ b/core/field_textinput.js @@ -13,8 +13,6 @@ goog.module('Blockly.FieldTextInput'); goog.module.declareLegacyNamespace(); -/* eslint-disable-next-line no-unused-vars */ -const BlockSvg = goog.requireType('Blockly.BlockSvg'); const Coordinate = goog.require('Blockly.utils.Coordinate'); const DropDownDiv = goog.require('Blockly.DropDownDiv'); const Events = goog.require('Blockly.Events'); @@ -32,6 +30,8 @@ const fieldRegistry = goog.require('Blockly.fieldRegistry'); const object = goog.require('Blockly.utils.object'); const userAgent = goog.require('Blockly.utils.userAgent'); const utils = goog.require('Blockly.utils'); +/* eslint-disable-next-line no-unused-vars */ +const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.BlockChange'); diff --git a/core/field_variable.js b/core/field_variable.js index 331b06dc0..c3e6988e8 100644 --- a/core/field_variable.js +++ b/core/field_variable.js @@ -13,8 +13,6 @@ goog.module('Blockly.FieldVariable'); goog.module.declareLegacyNamespace(); -/* eslint-disable-next-line no-unused-vars */ -const Block = goog.requireType('Blockly.Block'); const FieldDropdown = goog.require('Blockly.FieldDropdown'); /* eslint-disable-next-line no-unused-vars */ const Menu = goog.requireType('Blockly.Menu'); @@ -29,6 +27,8 @@ const fieldRegistry = goog.require('Blockly.fieldRegistry'); const internalConstants = goog.require('Blockly.internalConstants'); const object = goog.require('Blockly.utils.object'); const utils = goog.require('Blockly.utils'); +/* eslint-disable-next-line no-unused-vars */ +const {Block} = goog.requireType('Blockly.Block'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.BlockChange'); diff --git a/core/flyout_base.js b/core/flyout_base.js index 1f106b0f8..c4d1832a0 100644 --- a/core/flyout_base.js +++ b/core/flyout_base.js @@ -13,10 +13,6 @@ goog.module('Blockly.Flyout'); goog.module.declareLegacyNamespace(); -/* eslint-disable-next-line no-unused-vars */ -const Block = goog.requireType('Blockly.Block'); -/* eslint-disable-next-line no-unused-vars */ -const BlockSvg = goog.requireType('Blockly.BlockSvg'); const ComponentManager = goog.require('Blockly.ComponentManager'); const Coordinate = goog.require('Blockly.utils.Coordinate'); const DeleteArea = goog.require('Blockly.DeleteArea'); @@ -41,6 +37,10 @@ const idGenerator = goog.require('Blockly.utils.idGenerator'); const object = goog.require('Blockly.utils.object'); const toolbox = goog.require('Blockly.utils.toolbox'); const utils = goog.require('Blockly.utils'); +/* eslint-disable-next-line no-unused-vars */ +const {Block} = goog.requireType('Blockly.Block'); +/* eslint-disable-next-line no-unused-vars */ +const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); /** @suppress {extraRequire} */ goog.require('Blockly.blockRendering'); /** @suppress {extraRequire} */ diff --git a/core/generator.js b/core/generator.js index 7ebb000d2..ed7e20329 100644 --- a/core/generator.js +++ b/core/generator.js @@ -14,8 +14,6 @@ goog.module('Blockly.Generator'); goog.module.declareLegacyNamespace(); -/* eslint-disable-next-line no-unused-vars */ -const Block = goog.requireType('Blockly.Block'); /* eslint-disable-next-line no-unused-vars */ const Names = goog.requireType('Blockly.Names'); /* eslint-disable-next-line no-unused-vars */ @@ -23,6 +21,8 @@ const Workspace = goog.requireType('Blockly.Workspace'); const common = goog.require('Blockly.common'); const deprecation = goog.require('Blockly.utils.deprecation'); const internalConstants = goog.require('Blockly.internalConstants'); +/* eslint-disable-next-line no-unused-vars */ +const {Block} = goog.requireType('Blockly.Block'); /** diff --git a/core/gesture.js b/core/gesture.js index 9267c2998..077e14788 100644 --- a/core/gesture.js +++ b/core/gesture.js @@ -14,8 +14,6 @@ goog.module('Blockly.Gesture'); goog.module.declareLegacyNamespace(); -/* eslint-disable-next-line no-unused-vars */ -const BlockSvg = goog.requireType('Blockly.BlockSvg'); const BubbleDragger = goog.require('Blockly.BubbleDragger'); const Coordinate = goog.require('Blockly.utils.Coordinate'); const Events = goog.require('Blockly.Events'); @@ -38,6 +36,8 @@ const browserEvents = goog.require('Blockly.browserEvents'); const common = goog.require('Blockly.common'); const internalConstants = goog.require('Blockly.internalConstants'); const registry = goog.require('Blockly.registry'); +/* eslint-disable-next-line no-unused-vars */ +const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); /** @suppress {extraRequire} */ goog.require('Blockly.BlockDragger'); /** @suppress {extraRequire} */ diff --git a/core/icon.js b/core/icon.js index ba470e6bc..83dbaf583 100644 --- a/core/icon.js +++ b/core/icon.js @@ -13,8 +13,6 @@ goog.module('Blockly.Icon'); goog.module.declareLegacyNamespace(); -/* eslint-disable-next-line no-unused-vars */ -const BlockSvg = goog.requireType('Blockly.BlockSvg'); /* eslint-disable-next-line no-unused-vars */ const Bubble = goog.requireType('Blockly.Bubble'); const Coordinate = goog.require('Blockly.utils.Coordinate'); @@ -23,6 +21,8 @@ const Svg = goog.require('Blockly.utils.Svg'); const browserEvents = goog.require('Blockly.browserEvents'); const dom = goog.require('Blockly.utils.dom'); const utils = goog.require('Blockly.utils'); +/* eslint-disable-next-line no-unused-vars */ +const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); /** diff --git a/core/inject.js b/core/inject.js index 1e50d1914..054b97b24 100644 --- a/core/inject.js +++ b/core/inject.js @@ -13,7 +13,6 @@ goog.module('Blockly.inject'); goog.module.declareLegacyNamespace(); -const BlockDragSurfaceSvg = goog.require('Blockly.BlockDragSurfaceSvg'); /* eslint-disable-next-line no-unused-vars */ const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions'); const Css = goog.require('Blockly.Css'); @@ -37,6 +36,7 @@ const common = goog.require('Blockly.common'); const dom = goog.require('Blockly.utils.dom'); const userAgent = goog.require('Blockly.utils.userAgent'); const utils = goog.require('Blockly.utils'); +const {BlockDragSurfaceSvg} = goog.require('Blockly.BlockDragSurfaceSvg'); /** diff --git a/core/input.js b/core/input.js index 9eb3892f8..04dda6620 100644 --- a/core/input.js +++ b/core/input.js @@ -13,10 +13,6 @@ goog.module('Blockly.Input'); goog.module.declareLegacyNamespace(); -/* eslint-disable-next-line no-unused-vars */ -const Block = goog.requireType('Blockly.Block'); -/* eslint-disable-next-line no-unused-vars */ -const BlockSvg = goog.requireType('Blockly.BlockSvg'); /* eslint-disable-next-line no-unused-vars */ const Connection = goog.requireType('Blockly.Connection'); /* eslint-disable-next-line no-unused-vars */ @@ -26,6 +22,10 @@ const RenderedConnection = goog.requireType('Blockly.RenderedConnection'); const constants = goog.require('Blockly.constants'); const fieldRegistry = goog.require('Blockly.fieldRegistry'); const inputTypes = goog.require('Blockly.inputTypes'); +/* eslint-disable-next-line no-unused-vars */ +const {Block} = goog.requireType('Blockly.Block'); +/* eslint-disable-next-line no-unused-vars */ +const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); /** @suppress {extraRequire} */ goog.require('Blockly.FieldLabel'); diff --git a/core/insertion_marker_manager.js b/core/insertion_marker_manager.js index 004ac569e..bc4c2f311 100644 --- a/core/insertion_marker_manager.js +++ b/core/insertion_marker_manager.js @@ -15,8 +15,6 @@ goog.module.declareLegacyNamespace(); // TODO(#5073): Add Blockly require after fixing circular dependency. // goog.require('Blockly'); -/* eslint-disable-next-line no-unused-vars */ -const BlockSvg = goog.requireType('Blockly.BlockSvg'); const ComponentManager = goog.require('Blockly.ComponentManager'); /* eslint-disable-next-line no-unused-vars */ const Coordinate = goog.requireType('Blockly.utils.Coordinate'); @@ -34,6 +32,8 @@ const common = goog.require('Blockly.common'); const connectionTypes = goog.require('Blockly.connectionTypes'); const constants = goog.require('Blockly.constants'); const internalConstants = goog.require('Blockly.internalConstants'); +/* eslint-disable-next-line no-unused-vars */ +const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); /** diff --git a/core/interfaces/i_ast_node_location_with_block.js b/core/interfaces/i_ast_node_location_with_block.js index 0bef06154..b45bca4ea 100644 --- a/core/interfaces/i_ast_node_location_with_block.js +++ b/core/interfaces/i_ast_node_location_with_block.js @@ -15,10 +15,10 @@ goog.module('Blockly.IASTNodeLocationWithBlock'); goog.module.declareLegacyNamespace(); -/* eslint-disable-next-line no-unused-vars */ -const Block = goog.requireType('Blockly.Block'); /* eslint-disable-next-line no-unused-vars */ const IASTNodeLocation = goog.requireType('Blockly.IASTNodeLocation'); +/* eslint-disable-next-line no-unused-vars */ +const {Block} = goog.requireType('Blockly.Block'); /** diff --git a/core/interfaces/i_block_dragger.js b/core/interfaces/i_block_dragger.js index b87cd9865..a5068e192 100644 --- a/core/interfaces/i_block_dragger.js +++ b/core/interfaces/i_block_dragger.js @@ -14,10 +14,10 @@ goog.module('Blockly.IBlockDragger'); goog.module.declareLegacyNamespace(); -/* eslint-disable-next-line no-unused-vars */ -const BlockSvg = goog.requireType('Blockly.BlockSvg'); /* eslint-disable-next-line no-unused-vars */ const Coordinate = goog.requireType('Blockly.utils.Coordinate'); +/* eslint-disable-next-line no-unused-vars */ +const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); /** diff --git a/core/interfaces/i_bubble.js b/core/interfaces/i_bubble.js index a7578fc09..be59509b7 100644 --- a/core/interfaces/i_bubble.js +++ b/core/interfaces/i_bubble.js @@ -14,14 +14,14 @@ goog.module('Blockly.IBubble'); goog.module.declareLegacyNamespace(); -/* eslint-disable-next-line no-unused-vars */ -const BlockDragSurfaceSvg = goog.requireType('Blockly.BlockDragSurfaceSvg'); /* eslint-disable-next-line no-unused-vars */ const Coordinate = goog.requireType('Blockly.utils.Coordinate'); /* eslint-disable-next-line no-unused-vars */ const IContextMenu = goog.requireType('Blockly.IContextMenu'); /* eslint-disable-next-line no-unused-vars */ const IDraggable = goog.requireType('Blockly.IDraggable'); +/* eslint-disable-next-line no-unused-vars */ +const {BlockDragSurfaceSvg} = goog.requireType('Blockly.BlockDragSurfaceSvg'); /** diff --git a/core/interfaces/i_flyout.js b/core/interfaces/i_flyout.js index 405f0e482..030fd89fe 100644 --- a/core/interfaces/i_flyout.js +++ b/core/interfaces/i_flyout.js @@ -14,8 +14,6 @@ goog.module('Blockly.IFlyout'); goog.module.declareLegacyNamespace(); -/* eslint-disable-next-line no-unused-vars */ -const BlockSvg = goog.requireType('Blockly.BlockSvg'); /* eslint-disable-next-line no-unused-vars */ const Coordinate = goog.requireType('Blockly.utils.Coordinate'); /* eslint-disable-next-line no-unused-vars */ @@ -26,6 +24,8 @@ const Svg = goog.requireType('Blockly.utils.Svg'); const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); /* eslint-disable-next-line no-unused-vars */ const toolbox = goog.requireType('Blockly.utils.toolbox'); +/* eslint-disable-next-line no-unused-vars */ +const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); /** diff --git a/core/keyboard_nav/ast_node.js b/core/keyboard_nav/ast_node.js index 48e8eb1ae..550625681 100644 --- a/core/keyboard_nav/ast_node.js +++ b/core/keyboard_nav/ast_node.js @@ -12,8 +12,6 @@ goog.module('Blockly.ASTNode'); -/* eslint-disable-next-line no-unused-vars */ -const Block = goog.requireType('Blockly.Block'); /* eslint-disable-next-line no-unused-vars */ const Connection = goog.requireType('Blockly.Connection'); const Coordinate = goog.require('Blockly.utils.Coordinate'); @@ -28,6 +26,8 @@ const Input = goog.requireType('Blockly.Input'); /* eslint-disable-next-line no-unused-vars */ const Workspace = goog.requireType('Blockly.Workspace'); const connectionTypes = goog.require('Blockly.connectionTypes'); +/* eslint-disable-next-line no-unused-vars */ +const {Block} = goog.requireType('Blockly.Block'); /** diff --git a/core/mutator.js b/core/mutator.js index e3b5fd9d8..9a662750f 100644 --- a/core/mutator.js +++ b/core/mutator.js @@ -17,11 +17,7 @@ goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const Abstract = goog.requireType('Blockly.Events.Abstract'); /* eslint-disable-next-line no-unused-vars */ -const Block = goog.requireType('Blockly.Block'); -/* eslint-disable-next-line no-unused-vars */ const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions'); -/* eslint-disable-next-line no-unused-vars */ -const BlockSvg = goog.requireType('Blockly.BlockSvg'); const Bubble = goog.require('Blockly.Bubble'); /* eslint-disable-next-line no-unused-vars */ const Connection = goog.requireType('Blockly.Connection'); @@ -39,6 +35,10 @@ const internalConstants = goog.require('Blockly.internalConstants'); const object = goog.require('Blockly.utils.object'); const toolbox = goog.require('Blockly.utils.toolbox'); const xml = goog.require('Blockly.utils.xml'); +/* eslint-disable-next-line no-unused-vars */ +const {Block} = goog.requireType('Blockly.Block'); +/* eslint-disable-next-line no-unused-vars */ +const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.BlockChange'); /** @suppress {extraRequire} */ diff --git a/core/procedures.js b/core/procedures.js index 57a18b5dd..dbde96688 100644 --- a/core/procedures.js +++ b/core/procedures.js @@ -19,8 +19,6 @@ goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const Abstract = goog.requireType('Blockly.Events.Abstract'); -/* eslint-disable-next-line no-unused-vars */ -const Block = goog.requireType('Blockly.Block'); const Blocks = goog.require('Blockly.Blocks'); const Events = goog.require('Blockly.Events'); /* eslint-disable-next-line no-unused-vars */ @@ -33,6 +31,8 @@ const Workspace = goog.require('Blockly.Workspace'); const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); const Xml = goog.require('Blockly.Xml'); const utilsXml = goog.require('Blockly.utils.xml'); +/* eslint-disable-next-line no-unused-vars */ +const {Block} = goog.requireType('Blockly.Block'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.BlockChange'); diff --git a/core/rendered_connection.js b/core/rendered_connection.js index a4958c0f9..974093b71 100644 --- a/core/rendered_connection.js +++ b/core/rendered_connection.js @@ -13,10 +13,6 @@ goog.module('Blockly.RenderedConnection'); goog.module.declareLegacyNamespace(); -/* eslint-disable-next-line no-unused-vars */ -const Block = goog.requireType('Blockly.Block'); -/* eslint-disable-next-line no-unused-vars */ -const BlockSvg = goog.requireType('Blockly.BlockSvg'); const Connection = goog.require('Blockly.Connection'); /* eslint-disable-next-line no-unused-vars */ const ConnectionDB = goog.requireType('Blockly.ConnectionDB'); @@ -31,6 +27,10 @@ const internalConstants = goog.require('Blockly.internalConstants'); const object = goog.require('Blockly.utils.object'); const svgPaths = goog.require('Blockly.utils.svgPaths'); const utils = goog.require('Blockly.utils'); +/* eslint-disable-next-line no-unused-vars */ +const {Block} = goog.requireType('Blockly.Block'); +/* eslint-disable-next-line no-unused-vars */ +const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); /** diff --git a/core/renderers/common/debugger.js b/core/renderers/common/debugger.js index ebe19d791..299fd0a96 100644 --- a/core/renderers/common/debugger.js +++ b/core/renderers/common/debugger.js @@ -13,8 +13,6 @@ goog.module('Blockly.blockRendering.Debug'); goog.module.declareLegacyNamespace(); -/* eslint-disable-next-line no-unused-vars */ -const BlockSvg = goog.requireType('Blockly.BlockSvg'); /* eslint-disable-next-line no-unused-vars */ const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); const FieldLabel = goog.require('Blockly.FieldLabel'); @@ -32,6 +30,8 @@ const Svg = goog.require('Blockly.utils.Svg'); const Types = goog.require('Blockly.blockRendering.Types'); const connectionTypes = goog.require('Blockly.connectionTypes'); const dom = goog.require('Blockly.utils.dom'); +/* eslint-disable-next-line no-unused-vars */ +const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); /** diff --git a/core/renderers/common/drawer.js b/core/renderers/common/drawer.js index 430d91c47..f88e9faaa 100644 --- a/core/renderers/common/drawer.js +++ b/core/renderers/common/drawer.js @@ -13,8 +13,6 @@ goog.module('Blockly.blockRendering.Drawer'); goog.module.declareLegacyNamespace(); -/* eslint-disable-next-line no-unused-vars */ -const BlockSvg = goog.requireType('Blockly.BlockSvg'); /* eslint-disable-next-line no-unused-vars */ const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); /* eslint-disable-next-line no-unused-vars */ @@ -30,6 +28,8 @@ const Row = goog.requireType('Blockly.blockRendering.Row'); const Types = goog.require('Blockly.blockRendering.Types'); const blockRendering = goog.require('Blockly.blockRendering'); const svgPaths = goog.require('Blockly.utils.svgPaths'); +/* eslint-disable-next-line no-unused-vars */ +const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); /** diff --git a/core/renderers/common/i_path_object.js b/core/renderers/common/i_path_object.js index 1a8deb11e..80d465682 100644 --- a/core/renderers/common/i_path_object.js +++ b/core/renderers/common/i_path_object.js @@ -15,12 +15,12 @@ goog.module('Blockly.blockRendering.IPathObject'); goog.module.declareLegacyNamespace(); -/* eslint-disable-next-line no-unused-vars */ -const Block = goog.requireType('Blockly.Block'); /* eslint-disable-next-line no-unused-vars */ const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); /* eslint-disable-next-line no-unused-vars */ const Theme = goog.requireType('Blockly.Theme'); +/* eslint-disable-next-line no-unused-vars */ +const {Block} = goog.requireType('Blockly.Block'); /** diff --git a/core/renderers/common/info.js b/core/renderers/common/info.js index b5da1701d..3d807d04d 100644 --- a/core/renderers/common/info.js +++ b/core/renderers/common/info.js @@ -13,8 +13,6 @@ goog.module('Blockly.blockRendering.RenderInfo'); goog.module.declareLegacyNamespace(); -/* eslint-disable-next-line no-unused-vars */ -const BlockSvg = goog.requireType('Blockly.BlockSvg'); const BottomRow = goog.require('Blockly.blockRendering.BottomRow'); /* eslint-disable-next-line no-unused-vars */ const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); @@ -47,7 +45,8 @@ const TopRow = goog.require('Blockly.blockRendering.TopRow'); const Types = goog.require('Blockly.blockRendering.Types'); const constants = goog.require('Blockly.constants'); const inputTypes = goog.require('Blockly.inputTypes'); - +/* eslint-disable-next-line no-unused-vars */ +const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); /** diff --git a/core/renderers/common/marker_svg.js b/core/renderers/common/marker_svg.js index 171fa36a6..4ce311b36 100644 --- a/core/renderers/common/marker_svg.js +++ b/core/renderers/common/marker_svg.js @@ -16,8 +16,6 @@ goog.module.declareLegacyNamespace(); const ASTNode = goog.require('Blockly.ASTNode'); /* eslint-disable-next-line no-unused-vars */ -const BlockSvg = goog.requireType('Blockly.BlockSvg'); -/* eslint-disable-next-line no-unused-vars */ const Connection = goog.requireType('Blockly.Connection'); /* eslint-disable-next-line no-unused-vars */ const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); @@ -36,6 +34,8 @@ const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); const connectionTypes = goog.require('Blockly.connectionTypes'); const dom = goog.require('Blockly.utils.dom'); const svgPaths = goog.require('Blockly.utils.svgPaths'); +/* eslint-disable-next-line no-unused-vars */ +const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.MarkerMove'); diff --git a/core/renderers/common/path_object.js b/core/renderers/common/path_object.js index d8d36c9dc..34f6ee16a 100644 --- a/core/renderers/common/path_object.js +++ b/core/renderers/common/path_object.js @@ -14,8 +14,6 @@ goog.module('Blockly.blockRendering.PathObject'); goog.module.declareLegacyNamespace(); -/* eslint-disable-next-line no-unused-vars */ -const Block = goog.requireType('Blockly.Block'); /* eslint-disable-next-line no-unused-vars */ const Connection = goog.requireType('Blockly.Connection'); /* eslint-disable-next-line no-unused-vars */ @@ -26,6 +24,8 @@ const Svg = goog.require('Blockly.utils.Svg'); /* eslint-disable-next-line no-unused-vars */ const Theme = goog.requireType('Blockly.Theme'); const dom = goog.require('Blockly.utils.dom'); +/* eslint-disable-next-line no-unused-vars */ +const {Block} = goog.requireType('Blockly.Block'); /** diff --git a/core/renderers/common/renderer.js b/core/renderers/common/renderer.js index 0fdd2d00f..4f4f0a699 100644 --- a/core/renderers/common/renderer.js +++ b/core/renderers/common/renderer.js @@ -13,10 +13,6 @@ goog.module('Blockly.blockRendering.Renderer'); goog.module.declareLegacyNamespace(); -/* eslint-disable-next-line no-unused-vars */ -const Block = goog.requireType('Blockly.Block'); -/* eslint-disable-next-line no-unused-vars */ -const BlockSvg = goog.requireType('Blockly.BlockSvg'); const Connection = goog.require('Blockly.Connection'); const ConstantProvider = goog.require('Blockly.blockRendering.ConstantProvider'); /* eslint-disable-next-line no-unused-vars */ @@ -41,6 +37,10 @@ const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); const blockRendering = goog.require('Blockly.blockRendering'); const connectionTypes = goog.require('Blockly.connectionTypes'); const object = goog.require('Blockly.utils.object'); +/* eslint-disable-next-line no-unused-vars */ +const {Block} = goog.requireType('Blockly.Block'); +/* eslint-disable-next-line no-unused-vars */ +const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); /** diff --git a/core/renderers/geras/drawer.js b/core/renderers/geras/drawer.js index 8c4781890..15dcff2ae 100644 --- a/core/renderers/geras/drawer.js +++ b/core/renderers/geras/drawer.js @@ -14,8 +14,6 @@ goog.module('Blockly.geras.Drawer'); goog.module.declareLegacyNamespace(); const BaseDrawer = goog.require('Blockly.blockRendering.Drawer'); -/* eslint-disable-next-line no-unused-vars */ -const BlockSvg = goog.requireType('Blockly.BlockSvg'); const Highlighter = goog.require('Blockly.geras.Highlighter'); /* eslint-disable-next-line no-unused-vars */ const PathObject = goog.requireType('Blockly.geras.PathObject'); @@ -24,6 +22,8 @@ const RenderInfo = goog.requireType('Blockly.geras.RenderInfo'); const blockRendering = goog.require('Blockly.blockRendering'); const object = goog.require('Blockly.utils.object'); const svgPaths = goog.require('Blockly.utils.svgPaths'); +/* eslint-disable-next-line no-unused-vars */ +const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); /** diff --git a/core/renderers/geras/info.js b/core/renderers/geras/info.js index 582aab2da..8226cb292 100644 --- a/core/renderers/geras/info.js +++ b/core/renderers/geras/info.js @@ -15,8 +15,6 @@ goog.module('Blockly.geras.RenderInfo'); goog.module.declareLegacyNamespace(); const BaseRenderInfo = goog.require('Blockly.blockRendering.RenderInfo'); -/* eslint-disable-next-line no-unused-vars */ -const BlockSvg = goog.requireType('Blockly.BlockSvg'); const ExternalValueInput = goog.require('Blockly.blockRendering.ExternalValueInput'); /* eslint-disable-next-line no-unused-vars */ const Field = goog.requireType('Blockly.blockRendering.Field'); @@ -30,6 +28,8 @@ const StatementInput = goog.require('Blockly.geras.StatementInput'); const Types = goog.require('Blockly.blockRendering.Types'); const inputTypes = goog.require('Blockly.inputTypes'); const object = goog.require('Blockly.utils.object'); +/* eslint-disable-next-line no-unused-vars */ +const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); /** diff --git a/core/renderers/geras/renderer.js b/core/renderers/geras/renderer.js index 7c505e8c8..9cf592c69 100644 --- a/core/renderers/geras/renderer.js +++ b/core/renderers/geras/renderer.js @@ -18,8 +18,6 @@ const BaseRenderer = goog.require('Blockly.blockRendering.Renderer'); const BaseRenderInfo = goog.requireType('Blockly.blockRendering.RenderInfo'); /* eslint-disable-next-line no-unused-vars */ const BaseConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); -/* eslint-disable-next-line no-unused-vars */ -const BlockSvg = goog.requireType('Blockly.BlockSvg'); const ConstantProvider = goog.require('Blockly.geras.ConstantProvider'); const Drawer = goog.require('Blockly.geras.Drawer'); const HighlightConstantProvider = goog.require('Blockly.geras.HighlightConstantProvider'); @@ -29,6 +27,8 @@ const RenderInfo = goog.require('Blockly.geras.RenderInfo'); const Theme = goog.requireType('Blockly.Theme'); const blockRendering = goog.require('Blockly.blockRendering'); const object = goog.require('Blockly.utils.object'); +/* eslint-disable-next-line no-unused-vars */ +const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); /** diff --git a/core/renderers/measurables/bottom_row.js b/core/renderers/measurables/bottom_row.js index 1c4fe02ac..2ed324afe 100644 --- a/core/renderers/measurables/bottom_row.js +++ b/core/renderers/measurables/bottom_row.js @@ -13,8 +13,6 @@ goog.module('Blockly.blockRendering.BottomRow'); goog.module.declareLegacyNamespace(); -/* eslint-disable-next-line no-unused-vars */ -const BlockSvg = goog.requireType('Blockly.BlockSvg'); /* eslint-disable-next-line no-unused-vars */ const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); /* eslint-disable-next-line no-unused-vars */ @@ -22,6 +20,8 @@ const NextConnection = goog.requireType('Blockly.blockRendering.NextConnection') const Row = goog.require('Blockly.blockRendering.Row'); const Types = goog.require('Blockly.blockRendering.Types'); const object = goog.require('Blockly.utils.object'); +/* eslint-disable-next-line no-unused-vars */ +const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); /** diff --git a/core/renderers/measurables/top_row.js b/core/renderers/measurables/top_row.js index bc59170d6..e64ba06a6 100644 --- a/core/renderers/measurables/top_row.js +++ b/core/renderers/measurables/top_row.js @@ -12,8 +12,6 @@ goog.module('Blockly.blockRendering.TopRow'); goog.module.declareLegacyNamespace(); -/* eslint-disable-next-line no-unused-vars */ -const BlockSvg = goog.requireType('Blockly.BlockSvg'); /* eslint-disable-next-line no-unused-vars */ const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); /* eslint-disable-next-line no-unused-vars */ @@ -21,6 +19,8 @@ const PreviousConnection = goog.requireType('Blockly.blockRendering.PreviousConn const Row = goog.require('Blockly.blockRendering.Row'); const Types = goog.require('Blockly.blockRendering.Types'); const object = goog.require('Blockly.utils.object'); +/* eslint-disable-next-line no-unused-vars */ +const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); /** diff --git a/core/renderers/minimalist/drawer.js b/core/renderers/minimalist/drawer.js index d0cd3a417..161287b7a 100644 --- a/core/renderers/minimalist/drawer.js +++ b/core/renderers/minimalist/drawer.js @@ -14,10 +14,10 @@ goog.module.declareLegacyNamespace(); const BaseDrawer = goog.require('Blockly.blockRendering.Drawer'); /* eslint-disable-next-line no-unused-vars */ -const BlockSvg = goog.requireType('Blockly.BlockSvg'); -/* eslint-disable-next-line no-unused-vars */ const RenderInfo = goog.requireType('Blockly.minimalist.RenderInfo'); const object = goog.require('Blockly.utils.object'); +/* eslint-disable-next-line no-unused-vars */ +const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); /** diff --git a/core/renderers/minimalist/info.js b/core/renderers/minimalist/info.js index a2d40f041..c46b16860 100644 --- a/core/renderers/minimalist/info.js +++ b/core/renderers/minimalist/info.js @@ -14,10 +14,10 @@ goog.module.declareLegacyNamespace(); const BaseRenderInfo = goog.require('Blockly.blockRendering.RenderInfo'); /* eslint-disable-next-line no-unused-vars */ -const BlockSvg = goog.requireType('Blockly.BlockSvg'); -/* eslint-disable-next-line no-unused-vars */ const Renderer = goog.requireType('Blockly.minimalist.Renderer'); const object = goog.require('Blockly.utils.object'); +/* eslint-disable-next-line no-unused-vars */ +const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); /** diff --git a/core/renderers/minimalist/renderer.js b/core/renderers/minimalist/renderer.js index 365a00774..c2d1855f1 100644 --- a/core/renderers/minimalist/renderer.js +++ b/core/renderers/minimalist/renderer.js @@ -15,13 +15,13 @@ goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const BaseRenderInfo = goog.requireType('Blockly.blockRendering.RenderInfo'); const BaseRenderer = goog.require('Blockly.blockRendering.Renderer'); -/* eslint-disable-next-line no-unused-vars */ -const BlockSvg = goog.requireType('Blockly.BlockSvg'); const ConstantProvider = goog.require('Blockly.minimalist.ConstantProvider'); const Drawer = goog.require('Blockly.minimalist.Drawer'); const RenderInfo = goog.require('Blockly.minimalist.RenderInfo'); const blockRendering = goog.require('Blockly.blockRendering'); const object = goog.require('Blockly.utils.object'); +/* eslint-disable-next-line no-unused-vars */ +const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); /** diff --git a/core/renderers/thrasos/info.js b/core/renderers/thrasos/info.js index 974a0e76e..a48b3c2af 100644 --- a/core/renderers/thrasos/info.js +++ b/core/renderers/thrasos/info.js @@ -16,14 +16,14 @@ goog.module.declareLegacyNamespace(); const BaseRenderInfo = goog.require('Blockly.blockRendering.RenderInfo'); /* eslint-disable-next-line no-unused-vars */ -const BlockSvg = goog.requireType('Blockly.BlockSvg'); -/* eslint-disable-next-line no-unused-vars */ const Field = goog.requireType('Blockly.blockRendering.Field'); const InRowSpacer = goog.require('Blockly.blockRendering.InRowSpacer'); /* eslint-disable-next-line no-unused-vars */ const Renderer = goog.requireType('Blockly.thrasos.Renderer'); const Types = goog.require('Blockly.blockRendering.Types'); const object = goog.require('Blockly.utils.object'); +/* eslint-disable-next-line no-unused-vars */ +const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); /** diff --git a/core/renderers/thrasos/renderer.js b/core/renderers/thrasos/renderer.js index cda5d40d5..bbe85db11 100644 --- a/core/renderers/thrasos/renderer.js +++ b/core/renderers/thrasos/renderer.js @@ -14,11 +14,11 @@ goog.module('Blockly.thrasos.Renderer'); goog.module.declareLegacyNamespace(); const BaseRenderer = goog.require('Blockly.blockRendering.Renderer'); -/* eslint-disable-next-line no-unused-vars */ -const BlockSvg = goog.requireType('Blockly.BlockSvg'); const RenderInfo = goog.require('Blockly.thrasos.RenderInfo'); const blockRendering = goog.require('Blockly.blockRendering'); const object = goog.require('Blockly.utils.object'); +/* eslint-disable-next-line no-unused-vars */ +const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); /** diff --git a/core/renderers/zelos/drawer.js b/core/renderers/zelos/drawer.js index 554859b93..52e371a4d 100644 --- a/core/renderers/zelos/drawer.js +++ b/core/renderers/zelos/drawer.js @@ -15,8 +15,6 @@ goog.module.declareLegacyNamespace(); const BaseDrawer = goog.require('Blockly.blockRendering.Drawer'); /* eslint-disable-next-line no-unused-vars */ -const BlockSvg = goog.requireType('Blockly.BlockSvg'); -/* eslint-disable-next-line no-unused-vars */ const PathObject = goog.requireType('Blockly.zelos.PathObject'); /* eslint-disable-next-line no-unused-vars */ const RenderInfo = goog.requireType('Blockly.zelos.RenderInfo'); @@ -25,6 +23,8 @@ const Row = goog.requireType('Blockly.blockRendering.Row'); const blockRendering = goog.require('Blockly.blockRendering'); const object = goog.require('Blockly.utils.object'); const svgPaths = goog.require('Blockly.utils.svgPaths'); +/* eslint-disable-next-line no-unused-vars */ +const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); /** diff --git a/core/renderers/zelos/info.js b/core/renderers/zelos/info.js index c98826e27..7c2d62062 100644 --- a/core/renderers/zelos/info.js +++ b/core/renderers/zelos/info.js @@ -15,8 +15,6 @@ goog.module('Blockly.zelos.RenderInfo'); goog.module.declareLegacyNamespace(); const BaseRenderInfo = goog.require('Blockly.blockRendering.RenderInfo'); -/* eslint-disable-next-line no-unused-vars */ -const BlockSvg = goog.requireType('Blockly.BlockSvg'); const BottomRow = goog.require('Blockly.zelos.BottomRow'); /* eslint-disable-next-line no-unused-vars */ const ConstantProvider = goog.requireType('Blockly.zelos.ConstantProvider'); @@ -34,6 +32,8 @@ const Types = goog.require('Blockly.blockRendering.Types'); const constants = goog.require('Blockly.constants'); const inputTypes = goog.require('Blockly.inputTypes'); const object = goog.require('Blockly.utils.object'); +/* eslint-disable-next-line no-unused-vars */ +const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); /** diff --git a/core/renderers/zelos/marker_svg.js b/core/renderers/zelos/marker_svg.js index 0cd8c5dc9..af056a51f 100644 --- a/core/renderers/zelos/marker_svg.js +++ b/core/renderers/zelos/marker_svg.js @@ -17,8 +17,6 @@ goog.module.declareLegacyNamespace(); const ASTNode = goog.requireType('Blockly.ASTNode'); const BaseMarkerSvg = goog.require('Blockly.blockRendering.MarkerSvg'); /* eslint-disable-next-line no-unused-vars */ -const BlockSvg = goog.requireType('Blockly.BlockSvg'); -/* eslint-disable-next-line no-unused-vars */ const Connection = goog.requireType('Blockly.Connection'); /* eslint-disable-next-line no-unused-vars */ const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); @@ -29,6 +27,8 @@ const Svg = goog.require('Blockly.utils.Svg'); const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); const dom = goog.require('Blockly.utils.dom'); const object = goog.require('Blockly.utils.object'); +/* eslint-disable-next-line no-unused-vars */ +const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); /** diff --git a/core/renderers/zelos/renderer.js b/core/renderers/zelos/renderer.js index 0eb0ef4ed..f5a866f00 100644 --- a/core/renderers/zelos/renderer.js +++ b/core/renderers/zelos/renderer.js @@ -16,8 +16,6 @@ goog.module.declareLegacyNamespace(); const BaseRenderer = goog.require('Blockly.blockRendering.Renderer'); /* eslint-disable-next-line no-unused-vars */ const BaseRenderInfo = goog.requireType('Blockly.blockRendering.RenderInfo'); -/* eslint-disable-next-line no-unused-vars */ -const BlockSvg = goog.requireType('Blockly.BlockSvg'); const ConstantProvider = goog.require('Blockly.zelos.ConstantProvider'); const Drawer = goog.require('Blockly.zelos.Drawer'); const InsertionMarkerManager = goog.require('Blockly.InsertionMarkerManager'); @@ -33,6 +31,8 @@ const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); const blockRendering = goog.require('Blockly.blockRendering'); const connectionTypes = goog.require('Blockly.connectionTypes'); const object = goog.require('Blockly.utils.object'); +/* eslint-disable-next-line no-unused-vars */ +const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); /** diff --git a/core/serialization/blocks.js b/core/serialization/blocks.js index e8af944cc..56b07af71 100644 --- a/core/serialization/blocks.js +++ b/core/serialization/blocks.js @@ -15,8 +15,6 @@ goog.module.declareLegacyNamespace(); const {BadConnectionCheck, MissingBlockType, MissingConnection, RealChildOfShadow} = goog.require('Blockly.serialization.exceptions'); // eslint-disable-next-line no-unused-vars -const Block = goog.requireType('Blockly.Block'); -// eslint-disable-next-line no-unused-vars const Connection = goog.requireType('Blockly.Connection'); const Events = goog.require('Blockly.Events'); // eslint-disable-next-line no-unused-vars @@ -28,6 +26,8 @@ const Xml = goog.require('Blockly.Xml'); const inputTypes = goog.require('Blockly.inputTypes'); const priorities = goog.require('Blockly.serialization.priorities'); const serializationRegistry = goog.require('Blockly.serialization.registry'); +/* eslint-disable-next-line no-unused-vars */ +const {Block} = goog.requireType('Blockly.Block'); // TODO(#5160): Remove this once lint is fixed. @@ -342,7 +342,7 @@ const appendInternal = function( Events.fire(new (Events.get(Events.BLOCK_CREATE))(block)); Events.setGroup(existingGroup); Events.setRecordUndo(prevRecordUndo); - + // Adding connections to the connection db is expensive. This defers that // operation to decrease load time. if (workspace.rendered) { @@ -468,7 +468,7 @@ const tryToConnectParent = function(parentConnection, child, state) { if (parentConnection.getSourceBlock().isShadow() && !child.isShadow()) { throw new RealChildOfShadow(state); } - + let connected = false; let childConnection; if (parentConnection.type == inputTypes.VALUE) { diff --git a/core/serialization/exceptions.js b/core/serialization/exceptions.js index 4b85f5603..c776689a8 100644 --- a/core/serialization/exceptions.js +++ b/core/serialization/exceptions.js @@ -13,10 +13,11 @@ goog.module('Blockly.serialization.exceptions'); goog.module.declareLegacyNamespace(); -// eslint-disable-next-line no-unused-vars -const Block = goog.requireType('Blockly.Block'); // eslint-disable-next-line no-unused-vars const {State} = goog.requireType('Blockly.serialization.blocks'); +/* eslint-disable-next-line no-unused-vars */ +const {Block} = goog.requireType('Blockly.Block'); + class DeserializationError extends Error {} exports.DeserializationError = DeserializationError; diff --git a/core/shortcut_items.js b/core/shortcut_items.js index ca8a06441..45e48eb88 100644 --- a/core/shortcut_items.js +++ b/core/shortcut_items.js @@ -13,8 +13,6 @@ goog.module('Blockly.ShortcutItems'); goog.module.declareLegacyNamespace(); -/* 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'); @@ -22,6 +20,8 @@ const KeyCodes = goog.require('Blockly.utils.KeyCodes'); const ShortcutRegistry = goog.require('Blockly.ShortcutRegistry'); const clipboard = goog.require('Blockly.clipboard'); const common = goog.require('Blockly.common'); +/* eslint-disable-next-line no-unused-vars */ +const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); /** diff --git a/core/toolbox/toolbox.js b/core/toolbox/toolbox.js index 564f06aa5..e0eb0f611 100644 --- a/core/toolbox/toolbox.js +++ b/core/toolbox/toolbox.js @@ -15,7 +15,6 @@ goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions'); -const BlockSvg = goog.require('Blockly.BlockSvg'); const CollapsibleToolboxCategory = goog.require('Blockly.CollapsibleToolboxCategory'); const ComponentManager = goog.require('Blockly.ComponentManager'); const Css = goog.require('Blockly.Css'); @@ -54,6 +53,7 @@ const keyCodes = goog.require('Blockly.utils.KeyCodes'); const object = goog.require('Blockly.utils.object'); const registry = goog.require('Blockly.registry'); const toolbox = goog.require('Blockly.utils.toolbox'); +const {BlockSvg} = goog.require('Blockly.BlockSvg'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.ToolboxItemSelect'); diff --git a/core/utils.js b/core/utils.js index 5b5e74f8a..891e4d415 100644 --- a/core/utils.js +++ b/core/utils.js @@ -19,8 +19,6 @@ goog.module('Blockly.utils'); goog.module.declareLegacyNamespace(); -/* eslint-disable-next-line no-unused-vars */ -const Block = goog.requireType('Blockly.Block'); const Coordinate = goog.require('Blockly.utils.Coordinate'); const KeyCodes = goog.require('Blockly.utils.KeyCodes'); const Metrics = goog.require('Blockly.utils.Metrics'); @@ -46,6 +44,8 @@ const svgPaths = goog.require('Blockly.utils.svgPaths'); const toolbox = goog.require('Blockly.utils.toolbox'); const userAgent = goog.require('Blockly.utils.userAgent'); const xmlUtils = goog.require('Blockly.utils.xml'); +/* eslint-disable-next-line no-unused-vars */ +const {Block} = goog.requireType('Blockly.Block'); exports.aria = aria; diff --git a/core/variable_map.js b/core/variable_map.js index 29988150c..30b0eb6ec 100644 --- a/core/variable_map.js +++ b/core/variable_map.js @@ -13,8 +13,6 @@ goog.module('Blockly.VariableMap'); goog.module.declareLegacyNamespace(); -/* eslint-disable-next-line no-unused-vars */ -const Block = goog.requireType('Blockly.Block'); const Events = goog.require('Blockly.Events'); const Msg = goog.require('Blockly.Msg'); const Names = goog.require('Blockly.Names'); @@ -24,6 +22,8 @@ const Workspace = goog.requireType('Blockly.Workspace'); const dialog = goog.require('Blockly.dialog'); const idGenerator = goog.require('Blockly.utils.idGenerator'); const object = goog.require('Blockly.utils.object'); +/* eslint-disable-next-line no-unused-vars */ +const {Block} = goog.requireType('Blockly.Block'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.VarDelete'); /** @suppress {extraRequire} */ diff --git a/core/warning.js b/core/warning.js index 6ed5d0c02..debd9d529 100644 --- a/core/warning.js +++ b/core/warning.js @@ -13,10 +13,6 @@ goog.module('Blockly.Warning'); goog.module.declareLegacyNamespace(); -/* eslint-disable-next-line no-unused-vars */ -const Block = goog.requireType('Blockly.Block'); -/* eslint-disable-next-line no-unused-vars */ -const BlockSvg = goog.requireType('Blockly.BlockSvg'); const Bubble = goog.require('Blockly.Bubble'); /* eslint-disable-next-line no-unused-vars */ const Coordinate = goog.requireType('Blockly.utils.Coordinate'); @@ -25,6 +21,10 @@ const Icon = goog.require('Blockly.Icon'); const Svg = goog.require('Blockly.utils.Svg'); const dom = goog.require('Blockly.utils.dom'); const object = goog.require('Blockly.utils.object'); +/* eslint-disable-next-line no-unused-vars */ +const {Block} = goog.requireType('Blockly.Block'); +/* eslint-disable-next-line no-unused-vars */ +const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.BubbleOpen'); diff --git a/core/workspace.js b/core/workspace.js index c0c3bb608..55e273525 100644 --- a/core/workspace.js +++ b/core/workspace.js @@ -16,8 +16,6 @@ goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const Abstract = goog.requireType('Blockly.Events.Abstract'); /* eslint-disable-next-line no-unused-vars */ -const Block = goog.requireType('Blockly.Block'); -/* eslint-disable-next-line no-unused-vars */ const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions'); /* eslint-disable-next-line no-unused-vars */ const ConnectionDB = goog.requireType('Blockly.ConnectionDB'); @@ -38,6 +36,8 @@ const registry = goog.require('Blockly.registry'); /* eslint-disable-next-line no-unused-vars */ const toolbox = goog.requireType('Blockly.utils.toolbox'); const utils = goog.require('Blockly.utils'); +/* eslint-disable-next-line no-unused-vars */ +const {Block} = goog.requireType('Blockly.Block'); /** @suppress {extraRequire} */ goog.require('Blockly.ConnectionChecker'); @@ -522,7 +522,7 @@ Workspace.prototype.getWidth = function() { * @return {!Block} The created block. */ Workspace.prototype.newBlock = function(prototypeName, opt_id) { - const Block = goog.module.get('Blockly.Block'); + const {Block} = goog.module.get('Blockly.Block'); return new Block(this, prototypeName, opt_id); }; diff --git a/core/workspace_comment_svg.js b/core/workspace_comment_svg.js index 58ff479a4..3e4dc288b 100644 --- a/core/workspace_comment_svg.js +++ b/core/workspace_comment_svg.js @@ -13,8 +13,6 @@ goog.module('Blockly.WorkspaceCommentSvg'); goog.module.declareLegacyNamespace(); -/* eslint-disable-next-line no-unused-vars */ -const BlockDragSurfaceSvg = goog.requireType('Blockly.BlockDragSurfaceSvg'); const ContextMenu = goog.require('Blockly.ContextMenu'); const Coordinate = goog.require('Blockly.utils.Coordinate'); const Css = goog.require('Blockly.Css'); @@ -36,6 +34,8 @@ const common = goog.require('Blockly.common'); const dom = goog.require('Blockly.utils.dom'); const object = goog.require('Blockly.utils.object'); const utils = goog.require('Blockly.utils'); +/* eslint-disable-next-line no-unused-vars */ +const {BlockDragSurfaceSvg} = goog.requireType('Blockly.BlockDragSurfaceSvg'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.CommentCreate'); /** @suppress {extraRequire} */ diff --git a/core/workspace_svg.js b/core/workspace_svg.js index 15263d1c4..f4edf287d 100644 --- a/core/workspace_svg.js +++ b/core/workspace_svg.js @@ -13,11 +13,6 @@ goog.module('Blockly.WorkspaceSvg'); goog.module.declareLegacyNamespace(); -/* eslint-disable-next-line no-unused-vars */ -const Block = goog.requireType('Blockly.Block'); -/* eslint-disable-next-line no-unused-vars */ -const BlockDragSurfaceSvg = goog.requireType('Blockly.BlockDragSurfaceSvg'); -const BlockSvg = goog.require('Blockly.BlockSvg'); /* eslint-disable-next-line no-unused-vars */ const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions'); const Classic = goog.require('Blockly.Themes.Classic'); @@ -96,6 +91,11 @@ const object = goog.require('Blockly.utils.object'); const registry = goog.require('Blockly.registry'); const toolbox = goog.require('Blockly.utils.toolbox'); const utils = goog.require('Blockly.utils'); +/* eslint-disable-next-line no-unused-vars */ +const {Block} = goog.requireType('Blockly.Block'); +/* eslint-disable-next-line no-unused-vars */ +const {BlockDragSurfaceSvg} = goog.requireType('Blockly.BlockDragSurfaceSvg'); +const {BlockSvg} = goog.require('Blockly.BlockSvg'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.BlockCreate'); /** @suppress {extraRequire} */ @@ -1518,7 +1518,7 @@ WorkspaceSvg.prototype.paste = function(state) { if (this.currentGesture_) { this.currentGesture_.cancel(); // Dragging while pasting? No. } - + // Checks if this is JSON. JSON has a type property, while elements don't. if (state['type']) { this.pasteBlock_(null, /** @type {!blocks.State} */ (state)); diff --git a/core/xml.js b/core/xml.js index 7406e0e09..c6a14f491 100644 --- a/core/xml.js +++ b/core/xml.js @@ -13,8 +13,6 @@ goog.module('Blockly.Xml'); goog.module.declareLegacyNamespace(); -/* eslint-disable-next-line no-unused-vars */ -const Block = goog.requireType('Blockly.Block'); const Events = goog.require('Blockly.Events'); /* eslint-disable-next-line no-unused-vars */ const Connection = goog.requireType('Blockly.Connection'); @@ -30,6 +28,8 @@ const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); const dom = goog.require('Blockly.utils.dom'); const inputTypes = goog.require('Blockly.inputTypes'); const utilsXml = goog.require('Blockly.utils.xml'); +/* eslint-disable-next-line no-unused-vars */ +const {Block} = goog.requireType('Blockly.Block'); goog.requireType('Blockly.Comment'); goog.requireType('Blockly.Variables'); goog.requireType('Blockly.WorkspaceComment');