diff --git a/core/block.js b/core/block.js index 7dd5bb517..17dee120c 100644 --- a/core/block.js +++ b/core/block.js @@ -17,37 +17,37 @@ goog.module('Blockly.Block'); /* eslint-disable-next-line no-unused-vars */ const Abstract = goog.requireType('Blockly.Events.Abstract'); -/* eslint-disable-next-line no-unused-vars */ -const Comment = goog.requireType('Blockly.Comment'); -const Connection = goog.require('Blockly.Connection'); -const Coordinate = goog.require('Blockly.utils.Coordinate'); const Extensions = goog.require('Blockly.Extensions'); -/* eslint-disable-next-line no-unused-vars */ -const Field = goog.requireType('Blockly.Field'); -/* eslint-disable-next-line no-unused-vars */ -const IASTNodeLocation = goog.require('Blockly.IASTNodeLocation'); -/* eslint-disable-next-line no-unused-vars */ -const IDeletable = goog.require('Blockly.IDeletable'); -const Input = goog.require('Blockly.Input'); -/* eslint-disable-next-line no-unused-vars */ -const Mutator = goog.requireType('Blockly.Mutator'); -const Size = goog.require('Blockly.utils.Size'); const Tooltip = goog.require('Blockly.Tooltip'); -/* eslint-disable-next-line no-unused-vars */ -const VariableModel = goog.requireType('Blockly.VariableModel'); -/* eslint-disable-next-line no-unused-vars */ -const Workspace = goog.requireType('Blockly.Workspace'); const common = goog.require('Blockly.common'); const constants = goog.require('Blockly.constants'); const eventUtils = goog.require('Blockly.Events.utils'); const fieldRegistry = goog.require('Blockly.fieldRegistry'); const idGenerator = goog.require('Blockly.utils.idGenerator'); -const inputTypes = goog.require('Blockly.inputTypes'); const object = goog.require('Blockly.utils.object'); const utils = goog.require('Blockly.utils'); const {ASTNode} = goog.require('Blockly.ASTNode'); const {Blocks} = goog.require('Blockly.blocks'); +/* eslint-disable-next-line no-unused-vars */ +const {Comment} = goog.requireType('Blockly.Comment'); const {ConnectionType} = goog.require('Blockly.ConnectionType'); +const {Connection} = goog.require('Blockly.Connection'); +const {Coordinate} = goog.require('Blockly.utils.Coordinate'); +/* eslint-disable-next-line no-unused-vars */ +const {Field} = goog.requireType('Blockly.Field'); +/* eslint-disable-next-line no-unused-vars */ +const {IASTNodeLocation} = goog.require('Blockly.IASTNodeLocation'); +/* eslint-disable-next-line no-unused-vars */ +const {IDeletable} = goog.require('Blockly.IDeletable'); +const {Input} = goog.require('Blockly.Input'); +/* eslint-disable-next-line no-unused-vars */ +const {Mutator} = goog.requireType('Blockly.Mutator'); +const {Size} = goog.require('Blockly.utils.Size'); +/* eslint-disable-next-line no-unused-vars */ +const {VariableModel} = goog.requireType('Blockly.VariableModel'); +/* eslint-disable-next-line no-unused-vars */ +const {Workspace} = goog.requireType('Blockly.Workspace'); +const {inputTypes} = goog.require('Blockly.inputTypes'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.BlockChange'); /** @suppress {extraRequire} */ @@ -73,7 +73,7 @@ goog.require('Blockly.Events.BlockMove'); * @alias Blockly.Block */ const Block = function(workspace, prototypeName, opt_id) { - const Generator = goog.module.get('Blockly.Generator'); + const {Generator} = goog.module.get('Blockly.Generator'); if (Generator && typeof Generator.prototype[prototypeName] !== 'undefined') { // Occluding Generator class members is not allowed. throw Error( diff --git a/core/block_animations.js b/core/block_animations.js index 397ed5181..5cab1797e 100644 --- a/core/block_animations.js +++ b/core/block_animations.js @@ -15,10 +15,10 @@ */ goog.module('Blockly.blockAnimations'); -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'); +const {Svg} = goog.require('Blockly.utils.Svg'); /** diff --git a/core/block_drag_surface.js b/core/block_drag_surface.js index 283e68055..045f0e4da 100644 --- a/core/block_drag_surface.js +++ b/core/block_drag_surface.js @@ -26,10 +26,10 @@ */ goog.module('Blockly.BlockDragSurfaceSvg'); -const Coordinate = goog.require('Blockly.utils.Coordinate'); -const Svg = goog.require('Blockly.utils.Svg'); const dom = goog.require('Blockly.utils.dom'); const utils = goog.require('Blockly.utils'); +const {Coordinate} = goog.require('Blockly.utils.Coordinate'); +const {Svg} = goog.require('Blockly.utils.Svg'); /** diff --git a/core/block_dragger.js b/core/block_dragger.js index 1edc0d28b..e9e9409c6 100644 --- a/core/block_dragger.js +++ b/core/block_dragger.js @@ -15,14 +15,6 @@ */ goog.module('Blockly.BlockDragger'); -const Coordinate = goog.require('Blockly.utils.Coordinate'); -/* eslint-disable-next-line no-unused-vars */ -const IBlockDragger = goog.require('Blockly.IBlockDragger'); -/* eslint-disable-next-line no-unused-vars */ -const IDragTarget = goog.requireType('Blockly.IDragTarget'); -const InsertionMarkerManager = goog.require('Blockly.InsertionMarkerManager'); -/* eslint-disable-next-line no-unused-vars */ -const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); const blockAnimation = goog.require('Blockly.blockAnimations'); const bumpObjects = goog.require('Blockly.bumpObjects'); const common = goog.require('Blockly.common'); @@ -31,6 +23,14 @@ const eventUtils = goog.require('Blockly.Events.utils'); const registry = goog.require('Blockly.registry'); /* 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.require('Blockly.IBlockDragger'); +/* eslint-disable-next-line no-unused-vars */ +const {IDragTarget} = goog.requireType('Blockly.IDragTarget'); +const {InsertionMarkerManager} = goog.require('Blockly.InsertionMarkerManager'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.BlockDrag'); /** @suppress {extraRequire} */ diff --git a/core/block_svg.js b/core/block_svg.js index 9132cdd1a..5c8aeb1a7 100644 --- a/core/block_svg.js +++ b/core/block_svg.js @@ -15,46 +15,9 @@ */ goog.module('Blockly.BlockSvg'); -/* eslint-disable-next-line no-unused-vars */ -const BlockRenderingDebug = goog.requireType('Blockly.blockRendering.Debug'); -/* eslint-disable-next-line no-unused-vars */ -const Comment = goog.requireType('Blockly.Comment'); -/* eslint-disable-next-line no-unused-vars */ -const Connection = goog.requireType('Blockly.Connection'); const ContextMenu = goog.require('Blockly.ContextMenu'); -const ContextMenuRegistry = goog.require('Blockly.ContextMenuRegistry'); -const Coordinate = goog.require('Blockly.utils.Coordinate'); -/* eslint-disable-next-line no-unused-vars */ -const Field = goog.requireType('Blockly.Field'); -const FieldLabel = goog.require('Blockly.FieldLabel'); -/* eslint-disable-next-line no-unused-vars */ -const IASTNodeLocationSvg = goog.require('Blockly.IASTNodeLocationSvg'); -/* eslint-disable-next-line no-unused-vars */ -const IBoundedElement = goog.require('Blockly.IBoundedElement'); -/* eslint-disable-next-line no-unused-vars */ -const ICopyable = goog.require('Blockly.ICopyable'); -/* eslint-disable-next-line no-unused-vars */ -const IDraggable = goog.require('Blockly.IDraggable'); -/* eslint-disable-next-line no-unused-vars */ -const IPathObject = goog.requireType('Blockly.blockRendering.IPathObject'); -/* eslint-disable-next-line no-unused-vars */ -const Icon = goog.requireType('Blockly.Icon'); -/* eslint-disable-next-line no-unused-vars */ -const Input = goog.requireType('Blockly.Input'); -const MarkerManager = goog.require('Blockly.MarkerManager'); const Msg = goog.require('Blockly.Msg'); -/* eslint-disable-next-line no-unused-vars */ -const Mutator = goog.requireType('Blockly.Mutator'); -const Rect = goog.require('Blockly.utils.Rect'); -const RenderedConnection = goog.require('Blockly.RenderedConnection'); -const Svg = goog.require('Blockly.utils.Svg'); -/* eslint-disable-next-line no-unused-vars */ -const Theme = goog.requireType('Blockly.Theme'); const Tooltip = goog.require('Blockly.Tooltip'); -/* eslint-disable-next-line no-unused-vars */ -const Warning = goog.requireType('Blockly.Warning'); -/* eslint-disable-next-line no-unused-vars */ -const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); const blockAnimations = goog.require('Blockly.blockAnimations'); const blocks = goog.require('Blockly.serialization.blocks'); const browserEvents = goog.require('Blockly.browserEvents'); @@ -68,8 +31,45 @@ const userAgent = goog.require('Blockly.utils.userAgent'); const utils = goog.require('Blockly.utils'); const {ASTNode} = goog.require('Blockly.ASTNode'); const {Block} = goog.require('Blockly.Block'); +/* eslint-disable-next-line no-unused-vars */ +const {Comment} = goog.requireType('Blockly.Comment'); const {ConnectionType} = goog.require('Blockly.ConnectionType'); +/* eslint-disable-next-line no-unused-vars */ +const {Connection} = goog.requireType('Blockly.Connection'); +const {ContextMenuRegistry} = goog.require('Blockly.ContextMenuRegistry'); +const {Coordinate} = goog.require('Blockly.utils.Coordinate'); +/* eslint-disable-next-line no-unused-vars */ +const {Debug: BlockRenderingDebug} = goog.requireType('Blockly.blockRendering.Debug'); +const {FieldLabel} = goog.require('Blockly.FieldLabel'); +/* eslint-disable-next-line no-unused-vars */ +const {Field} = goog.requireType('Blockly.Field'); +/* eslint-disable-next-line no-unused-vars */ +const {IASTNodeLocationSvg} = goog.require('Blockly.IASTNodeLocationSvg'); +/* eslint-disable-next-line no-unused-vars */ +const {IBoundedElement} = goog.require('Blockly.IBoundedElement'); +/* eslint-disable-next-line no-unused-vars */ +const {ICopyable} = goog.require('Blockly.ICopyable'); +/* eslint-disable-next-line no-unused-vars */ +const {IDraggable} = goog.require('Blockly.IDraggable'); +/* eslint-disable-next-line no-unused-vars */ +const {IPathObject} = goog.requireType('Blockly.blockRendering.IPathObject'); +/* eslint-disable-next-line no-unused-vars */ +const {Icon} = goog.requireType('Blockly.Icon'); +/* eslint-disable-next-line no-unused-vars */ +const {Input} = goog.requireType('Blockly.Input'); +const {MarkerManager} = goog.require('Blockly.MarkerManager'); +/* eslint-disable-next-line no-unused-vars */ +const {Mutator} = goog.requireType('Blockly.Mutator'); +const {Rect} = goog.require('Blockly.utils.Rect'); +const {RenderedConnection} = goog.require('Blockly.RenderedConnection'); +const {Svg} = goog.require('Blockly.utils.Svg'); const {TabNavigateCursor} = goog.require('Blockly.TabNavigateCursor'); +/* eslint-disable-next-line no-unused-vars */ +const {Theme} = goog.requireType('Blockly.Theme'); +/* eslint-disable-next-line no-unused-vars */ +const {Warning} = goog.requireType('Blockly.Warning'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.BlockMove'); /** @suppress {extraRequire} */ @@ -1028,7 +1028,7 @@ BlockSvg.prototype.getCommentIcon = function() { * @param {?string} text The text, or null to delete. */ BlockSvg.prototype.setCommentText = function(text) { - const Comment = goog.module.get('Blockly.Comment'); + const {Comment} = goog.module.get('Blockly.Comment'); if (!Comment) { throw Error('Missing require for Blockly.Comment'); } @@ -1066,7 +1066,7 @@ BlockSvg.prototype.setCommentText = function(text) { * maintain multiple warnings. */ BlockSvg.prototype.setWarningText = function(text, opt_id) { - const Warning = goog.module.get('Blockly.Warning'); + const {Warning} = goog.module.get('Blockly.Warning'); if (!Warning) { throw Error('Missing require for Blockly.Warning'); } diff --git a/core/blockly.js b/core/blockly.js index 56e9e0010..22f49ecf8 100644 --- a/core/blockly.js +++ b/core/blockly.js @@ -16,117 +16,22 @@ goog.module('Blockly'); goog.module.declareLegacyNamespace(); -const BlocklyOptions = goog.require('Blockly.BlocklyOptions'); -const Bubble = goog.require('Blockly.Bubble'); -const BubbleDragger = goog.require('Blockly.BubbleDragger'); -const CollapsibleToolboxCategory = goog.require('Blockly.CollapsibleToolboxCategory'); -const Comment = goog.require('Blockly.Comment'); -const ComponentManager = goog.require('Blockly.ComponentManager'); -const ConnectionChecker = goog.require('Blockly.ConnectionChecker'); -const ConnectionDB = goog.require('Blockly.ConnectionDB'); -const Connection = goog.require('Blockly.Connection'); const ContextMenu = goog.require('Blockly.ContextMenu'); const ContextMenuItems = goog.require('Blockly.ContextMenuItems'); -const ContextMenuRegistry = goog.require('Blockly.ContextMenuRegistry'); const Css = goog.require('Blockly.Css'); -const DeleteArea = goog.require('Blockly.DeleteArea'); -const DragTarget = goog.require('Blockly.DragTarget'); -const DropDownDiv = goog.require('Blockly.DropDownDiv'); const Events = goog.require('Blockly.Events'); const Extensions = goog.require('Blockly.Extensions'); -const Field = goog.require('Blockly.Field'); -const FieldAngle = goog.require('Blockly.FieldAngle'); -const FieldCheckbox = goog.require('Blockly.FieldCheckbox'); -const FieldColour = goog.require('Blockly.FieldColour'); -const FieldDropdown = goog.require('Blockly.FieldDropdown'); -const FieldImage = goog.require('Blockly.FieldImage'); -const FieldLabel = goog.require('Blockly.FieldLabel'); -const FieldLabelSerializable = goog.require('Blockly.FieldLabelSerializable'); -const FieldMultilineInput = goog.require('Blockly.FieldMultilineInput'); -const FieldNumber = goog.require('Blockly.FieldNumber'); -const FieldTextInput = goog.require('Blockly.FieldTextInput'); -const FieldVariable = goog.require('Blockly.FieldVariable'); -const Flyout = goog.require('Blockly.Flyout'); -const FlyoutButton = goog.require('Blockly.FlyoutButton'); -const FlyoutMetricsManager = goog.require('Blockly.FlyoutMetricsManager'); -const Generator = goog.require('Blockly.Generator'); -const Gesture = goog.require('Blockly.Gesture'); -const Grid = goog.require('Blockly.Grid'); -const HorizontalFlyout = goog.require('Blockly.HorizontalFlyout'); -const IASTNodeLocation = goog.require('Blockly.IASTNodeLocation'); -const IASTNodeLocationSvg = goog.require('Blockly.IASTNodeLocationSvg'); -const IASTNodeLocationWithBlock = goog.require('Blockly.IASTNodeLocationWithBlock'); -const IAutoHideable = goog.require('Blockly.IAutoHideable'); -const IBlockDragger = goog.require('Blockly.IBlockDragger'); -const IBoundedElement = goog.require('Blockly.IBoundedElement'); -const IBubble = goog.require('Blockly.IBubble'); -const ICollapsibleToolboxItem = goog.require('Blockly.ICollapsibleToolboxItem'); -const IComponent = goog.require('Blockly.IComponent'); -const IConnectionChecker = goog.require('Blockly.IConnectionChecker'); -const IContextMenu = goog.require('Blockly.IContextMenu'); -const Icon = goog.require('Blockly.Icon'); -const ICopyable = goog.require('Blockly.ICopyable'); -const IDeletable = goog.require('Blockly.IDeletable'); -const IDeleteArea = goog.require('Blockly.IDeleteArea'); -const IDragTarget = goog.require('Blockly.IDragTarget'); -const IDraggable = goog.require('Blockly.IDraggable'); -const IFlyout = goog.require('Blockly.IFlyout'); -const IKeyboardAccessible = goog.require('Blockly.IKeyboardAccessible'); -const IMetricsManager = goog.require('Blockly.IMetricsManager'); -const IMovable = goog.require('Blockly.IMovable'); -const Input = goog.require('Blockly.Input'); -const InsertionMarkerManager = goog.require('Blockly.InsertionMarkerManager'); -const IPositionable = goog.require('Blockly.IPositionable'); -const IRegistrable = goog.require('Blockly.IRegistrable'); -const IRegistrableField = goog.require('Blockly.IRegistrableField'); -const ISelectable = goog.require('Blockly.ISelectable'); -const ISelectableToolboxItem = goog.require('Blockly.ISelectableToolboxItem'); -const IStyleable = goog.require('Blockly.IStyleable'); -const IToolbox = goog.require('Blockly.IToolbox'); -const IToolboxItem = goog.require('Blockly.IToolboxItem'); const Marker = goog.require('Blockly.Marker'); -const MarkerManager = goog.require('Blockly.MarkerManager'); -const Menu = goog.require('Blockly.Menu'); -const MenuItem = goog.require('Blockly.MenuItem'); -const MetricsManager = goog.require('Blockly.MetricsManager'); -const Mutator = goog.require('Blockly.Mutator'); -const Names = goog.require('Blockly.Names'); -const Options = goog.require('Blockly.Options'); const Procedures = goog.require('Blockly.Procedures'); -const RenderedConnection = goog.require('Blockly.RenderedConnection'); -const Scrollbar = goog.require('Blockly.Scrollbar'); -const ScrollbarPair = goog.require('Blockly.ScrollbarPair'); const ShortcutItems = goog.require('Blockly.ShortcutItems'); -const ShortcutRegistry = goog.require('Blockly.ShortcutRegistry'); -const Size = goog.require('Blockly.utils.Size'); const TabNavigateCursor = goog.require('Blockly.TabNavigateCursor'); -const Theme = goog.require('Blockly.Theme'); const Themes = goog.require('Blockly.Themes'); -const ThemeManager = goog.require('Blockly.ThemeManager'); -const Toolbox = goog.require('Blockly.Toolbox'); -const ToolboxCategory = goog.require('Blockly.ToolboxCategory'); -const ToolboxItem = goog.require('Blockly.ToolboxItem'); -const ToolboxSeparator = goog.require('Blockly.ToolboxSeparator'); const Tooltip = goog.require('Blockly.Tooltip'); const Touch = goog.require('Blockly.Touch'); -const TouchGesture = goog.require('Blockly.TouchGesture'); -const Trashcan = goog.require('Blockly.Trashcan'); -const VariableMap = goog.require('Blockly.VariableMap'); -const VariableModel = goog.require('Blockly.VariableModel'); const Variables = goog.require('Blockly.Variables'); const VariablesDynamic = goog.require('Blockly.VariablesDynamic'); -const VerticalFlyout = goog.require('Blockly.VerticalFlyout'); -const Warning = goog.require('Blockly.Warning'); const WidgetDiv = goog.require('Blockly.WidgetDiv'); -const Workspace = goog.require('Blockly.Workspace'); -const WorkspaceAudio = goog.require('Blockly.WorkspaceAudio'); -const WorkspaceComment = goog.require('Blockly.WorkspaceComment'); -const WorkspaceCommentSvg = goog.require('Blockly.WorkspaceCommentSvg'); -const WorkspaceDragSurfaceSvg = goog.require('Blockly.WorkspaceDragSurfaceSvg'); -const WorkspaceDragger = goog.require('Blockly.WorkspaceDragger'); -const WorkspaceSvg = goog.require('Blockly.WorkspaceSvg'); const Xml = goog.require('Blockly.Xml'); -const ZoomControls = goog.require('Blockly.ZoomControls'); const blockAnimations = goog.require('Blockly.blockAnimations'); const blockRendering = goog.require('Blockly.blockRendering'); const browserEvents = goog.require('Blockly.browserEvents'); @@ -139,8 +44,6 @@ const deprecation = goog.require('Blockly.utils.deprecation'); const dialog = goog.require('Blockly.dialog'); const fieldRegistry = goog.require('Blockly.fieldRegistry'); const geras = goog.require('Blockly.geras'); -const inject = goog.require('Blockly.inject'); -const inputTypes = goog.require('Blockly.inputTypes'); const internalConstants = goog.require('Blockly.internalConstants'); const minimalist = goog.require('Blockly.minimalist'); const registry = goog.require('Blockly.registry'); @@ -151,14 +54,111 @@ const utils = goog.require('Blockly.utils'); const zelos = goog.require('Blockly.zelos'); const {ASTNode} = goog.require('Blockly.ASTNode'); const {BasicCursor} = goog.require('Blockly.BasicCursor'); -const {Block} = goog.require('Blockly.Block'); -const {BlockDragger} = goog.require('Blockly.BlockDragger'); const {BlockDragSurfaceSvg} = goog.require('Blockly.BlockDragSurfaceSvg'); +const {BlockDragger} = goog.require('Blockly.BlockDragger'); const {BlockSvg} = goog.require('Blockly.BlockSvg'); +const {BlocklyOptions} = goog.require('Blockly.BlocklyOptions'); const {Blocks} = goog.require('Blockly.blocks'); +const {Block} = goog.require('Blockly.Block'); +const {BubbleDragger} = goog.require('Blockly.BubbleDragger'); +const {Bubble} = goog.require('Blockly.Bubble'); +const {CollapsibleToolboxCategory} = goog.require('Blockly.CollapsibleToolboxCategory'); +const {Comment} = goog.require('Blockly.Comment'); +const {ComponentManager} = goog.require('Blockly.ComponentManager'); +const {ConnectionChecker} = goog.require('Blockly.ConnectionChecker'); +const {ConnectionDB} = goog.require('Blockly.ConnectionDB'); const {ConnectionType} = goog.require('Blockly.ConnectionType'); +const {Connection} = goog.require('Blockly.Connection'); +const {ContextMenuRegistry} = goog.require('Blockly.ContextMenuRegistry'); const {Cursor} = goog.require('Blockly.Cursor'); +const {DeleteArea} = goog.require('Blockly.DeleteArea'); +const {DragTarget} = goog.require('Blockly.DragTarget'); +const {DropDownDiv} = goog.require('Blockly.DropDownDiv'); +const {FieldAngle} = goog.require('Blockly.FieldAngle'); +const {FieldCheckbox} = goog.require('Blockly.FieldCheckbox'); +const {FieldColour} = goog.require('Blockly.FieldColour'); +const {FieldDropdown} = goog.require('Blockly.FieldDropdown'); +const {FieldImage} = goog.require('Blockly.FieldImage'); +const {FieldLabelSerializable} = goog.require('Blockly.FieldLabelSerializable'); +const {FieldLabel} = goog.require('Blockly.FieldLabel'); +const {FieldMultilineInput} = goog.require('Blockly.FieldMultilineInput'); +const {FieldNumber} = goog.require('Blockly.FieldNumber'); +const {FieldTextInput} = goog.require('Blockly.FieldTextInput'); +const {FieldVariable} = goog.require('Blockly.FieldVariable'); +const {Field} = goog.require('Blockly.Field'); +const {FlyoutButton} = goog.require('Blockly.FlyoutButton'); +const {FlyoutMetricsManager} = goog.require('Blockly.FlyoutMetricsManager'); +const {Flyout} = goog.require('Blockly.Flyout'); +const {Generator} = goog.require('Blockly.Generator'); +const {Gesture} = goog.require('Blockly.Gesture'); +const {Grid} = goog.require('Blockly.Grid'); +const {HorizontalFlyout} = goog.require('Blockly.HorizontalFlyout'); +const {IASTNodeLocationSvg} = goog.require('Blockly.IASTNodeLocationSvg'); +const {IASTNodeLocationWithBlock} = goog.require('Blockly.IASTNodeLocationWithBlock'); +const {IASTNodeLocation} = goog.require('Blockly.IASTNodeLocation'); +const {IAutoHideable} = goog.require('Blockly.IAutoHideable'); +const {IBlockDragger} = goog.require('Blockly.IBlockDragger'); +const {IBoundedElement} = goog.require('Blockly.IBoundedElement'); +const {IBubble} = goog.require('Blockly.IBubble'); +const {ICollapsibleToolboxItem} = goog.require('Blockly.ICollapsibleToolboxItem'); +const {IComponent} = goog.require('Blockly.IComponent'); +const {IConnectionChecker} = goog.require('Blockly.IConnectionChecker'); +const {IContextMenu} = goog.require('Blockly.IContextMenu'); +const {ICopyable} = goog.require('Blockly.ICopyable'); +const {IDeletable} = goog.require('Blockly.IDeletable'); +const {IDeleteArea} = goog.require('Blockly.IDeleteArea'); +const {IDragTarget} = goog.require('Blockly.IDragTarget'); +const {IDraggable} = goog.require('Blockly.IDraggable'); +const {IFlyout} = goog.require('Blockly.IFlyout'); +const {IKeyboardAccessible} = goog.require('Blockly.IKeyboardAccessible'); +const {IMetricsManager} = goog.require('Blockly.IMetricsManager'); +const {IMovable} = goog.require('Blockly.IMovable'); +const {IPositionable} = goog.require('Blockly.IPositionable'); +const {IRegistrableField} = goog.require('Blockly.IRegistrableField'); +const {IRegistrable} = goog.require('Blockly.IRegistrable'); +const {ISelectableToolboxItem} = goog.require('Blockly.ISelectableToolboxItem'); +const {ISelectable} = goog.require('Blockly.ISelectable'); +const {IStyleable} = goog.require('Blockly.IStyleable'); +const {IToolboxItem} = goog.require('Blockly.IToolboxItem'); +const {IToolbox} = goog.require('Blockly.IToolbox'); +const {Icon} = goog.require('Blockly.Icon'); +const {Input} = goog.require('Blockly.Input'); +const {InsertionMarkerManager} = goog.require('Blockly.InsertionMarkerManager'); +const {MarkerManager} = goog.require('Blockly.MarkerManager'); +const {MenuItem} = goog.require('Blockly.MenuItem'); +const {Menu} = goog.require('Blockly.Menu'); +const {MetricsManager} = goog.require('Blockly.MetricsManager'); +const {Mutator} = goog.require('Blockly.Mutator'); +const {Names} = goog.require('Blockly.Names'); +const {Options} = goog.require('Blockly.Options'); +const {RenderedConnection} = goog.require('Blockly.RenderedConnection'); +const {ScrollbarPair} = goog.require('Blockly.ScrollbarPair'); +const {Scrollbar} = goog.require('Blockly.Scrollbar'); +const {ShortcutRegistry} = goog.require('Blockly.ShortcutRegistry'); +const {Size} = goog.require('Blockly.utils.Size'); +const {ThemeManager} = goog.require('Blockly.ThemeManager'); +const {Theme} = goog.require('Blockly.Theme'); +const {ToolboxCategory} = goog.require('Blockly.ToolboxCategory'); +const {ToolboxItem} = goog.require('Blockly.ToolboxItem'); +const {ToolboxSeparator} = goog.require('Blockly.ToolboxSeparator'); +const {Toolbox} = goog.require('Blockly.Toolbox'); +const {TouchGesture} = goog.require('Blockly.TouchGesture'); +const {Trashcan} = goog.require('Blockly.Trashcan'); +const {VariableMap} = goog.require('Blockly.VariableMap'); +const {VariableModel} = goog.require('Blockly.VariableModel'); +const {VerticalFlyout} = goog.require('Blockly.VerticalFlyout'); +const {Warning} = goog.require('Blockly.Warning'); +const {WorkspaceAudio} = goog.require('Blockly.WorkspaceAudio'); +const {WorkspaceCommentSvg} = goog.require('Blockly.WorkspaceCommentSvg'); +const {WorkspaceComment} = goog.require('Blockly.WorkspaceComment'); +const {WorkspaceDragSurfaceSvg} = goog.require('Blockly.WorkspaceDragSurfaceSvg'); +const {WorkspaceDragger} = goog.require('Blockly.WorkspaceDragger'); +const {WorkspaceSvg} = goog.require('Blockly.WorkspaceSvg'); +const {Workspace} = goog.require('Blockly.Workspace'); +const {ZoomControls} = goog.require('Blockly.ZoomControls'); const {globalThis} = goog.require('Blockly.utils.global'); +const {inject} = goog.require('Blockly.inject'); +const {inputTypes} = goog.require('Blockly.inputTypes'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.BlockCreate'); /** @suppress {extraRequire} */ @@ -169,16 +169,6 @@ goog.require('Blockly.Events.Ui'); goog.require('Blockly.Events.UiBase'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.VarCreate'); -/** @suppress {extraRequire} */ -goog.require('Blockly.inject'); -/** @suppress {extraRequire} */ -goog.require('Blockly.Procedures'); -/** @suppress {extraRequire} */ -goog.require('Blockly.Touch'); -/** @suppress {extraRequire} */ -goog.require('Blockly.Variables'); -/** @suppress {extraRequire} */ -goog.require('Blockly.Xml'); /** diff --git a/core/blockly_options.js b/core/blockly_options.js index fdca976d3..a87c04474 100644 --- a/core/blockly_options.js +++ b/core/blockly_options.js @@ -25,4 +25,4 @@ goog.module('Blockly.BlocklyOptions'); */ const BlocklyOptions = function() {}; -exports = BlocklyOptions; +exports.BlocklyOptions = BlocklyOptions; diff --git a/core/browser_events.js b/core/browser_events.js index 3eb96167e..a33de9c26 100644 --- a/core/browser_events.js +++ b/core/browser_events.js @@ -16,9 +16,9 @@ goog.module('Blockly.browserEvents'); const Touch = goog.require('Blockly.Touch'); -const {globalThis} = goog.require('Blockly.utils.global'); const internalConstants = goog.require('Blockly.internalConstants'); const userAgent = goog.require('Blockly.utils.userAgent'); +const {globalThis} = goog.require('Blockly.utils.global'); /** diff --git a/core/bubble.js b/core/bubble.js index b7e27fcfd..4aae3372c 100644 --- a/core/bubble.js +++ b/core/bubble.js @@ -15,17 +15,7 @@ */ goog.module('Blockly.Bubble'); -const Coordinate = goog.require('Blockly.utils.Coordinate'); -/* eslint-disable-next-line no-unused-vars */ -const IBubble = goog.require('Blockly.IBubble'); -/* eslint-disable-next-line no-unused-vars */ -const MetricsManager = goog.requireType('Blockly.MetricsManager'); -const Scrollbar = goog.require('Blockly.Scrollbar'); -const Size = goog.require('Blockly.utils.Size'); -const Svg = goog.require('Blockly.utils.Svg'); const Touch = goog.require('Blockly.Touch'); -/* eslint-disable-next-line no-unused-vars */ -const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); const browserEvents = goog.require('Blockly.browserEvents'); const dom = goog.require('Blockly.utils.dom'); const math = goog.require('Blockly.utils.math'); @@ -34,6 +24,16 @@ const userAgent = goog.require('Blockly.utils.userAgent'); 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.require('Blockly.IBubble'); +/* eslint-disable-next-line no-unused-vars */ +const {MetricsManager} = goog.requireType('Blockly.MetricsManager'); +const {Scrollbar} = goog.require('Blockly.Scrollbar'); +const {Size} = goog.require('Blockly.utils.Size'); +const {Svg} = goog.require('Blockly.utils.Svg'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg'); /** @suppress {extraRequire} */ goog.require('Blockly.Workspace'); @@ -938,4 +938,4 @@ Bubble.createNonEditableBubble = function(paragraphElement, block, iconXY) { return bubble; }; -exports = Bubble; +exports.Bubble = Bubble; diff --git a/core/bubble_dragger.js b/core/bubble_dragger.js index f90129060..742341095 100644 --- a/core/bubble_dragger.js +++ b/core/bubble_dragger.js @@ -15,22 +15,22 @@ */ goog.module('Blockly.BubbleDragger'); -const ComponentManager = goog.require('Blockly.ComponentManager'); -const Coordinate = goog.require('Blockly.utils.Coordinate'); -/* eslint-disable-next-line no-unused-vars */ -const IBubble = goog.requireType('Blockly.IBubble'); -/* eslint-disable-next-line no-unused-vars */ -const IDeleteArea = goog.requireType('Blockly.IDeleteArea'); -/* eslint-disable-next-line no-unused-vars */ -const IDragTarget = goog.requireType('Blockly.IDragTarget'); -/* eslint-disable-next-line no-unused-vars */ -const WorkspaceCommentSvg = goog.requireType('Blockly.WorkspaceCommentSvg'); -/* eslint-disable-next-line no-unused-vars */ -const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); const eventUtils = goog.require('Blockly.Events.utils'); const utils = goog.require('Blockly.utils'); /* 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'); +/* eslint-disable-next-line no-unused-vars */ +const {IBubble} = goog.requireType('Blockly.IBubble'); +/* eslint-disable-next-line no-unused-vars */ +const {IDeleteArea} = goog.requireType('Blockly.IDeleteArea'); +/* eslint-disable-next-line no-unused-vars */ +const {IDragTarget} = goog.requireType('Blockly.IDragTarget'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceCommentSvg} = goog.requireType('Blockly.WorkspaceCommentSvg'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg'); /** @suppress {extraRequire} */ goog.require('Blockly.Bubble'); /** @suppress {extraRequire} */ @@ -288,4 +288,4 @@ BubbleDragger.prototype.moveToDragSurface_ = function() { this.dragSurface_.setBlocksAndShow(this.draggingBubble_.getSvgRoot()); }; -exports = BubbleDragger; +exports.BubbleDragger = BubbleDragger; diff --git a/core/bump_objects.js b/core/bump_objects.js index 7fb61c2ac..2b7dc82a7 100644 --- a/core/bump_objects.js +++ b/core/bump_objects.js @@ -17,20 +17,20 @@ goog.module('Blockly.bumpObjects'); /* eslint-disable-next-line no-unused-vars */ const Abstract = goog.requireType('Blockly.Events.Abstract'); -/* eslint-disable-next-line no-unused-vars */ -const IBoundedElement = goog.requireType('Blockly.IBoundedElement'); -/* eslint-disable-next-line no-unused-vars */ -const MetricsManager = goog.requireType('Blockly.MetricsManager'); -/* eslint-disable-next-line no-unused-vars */ -const ViewportChange = goog.requireType('Blockly.Events.ViewportChange'); -/* eslint-disable-next-line no-unused-vars */ -const WorkspaceCommentSvg = goog.requireType('Blockly.WorkspaceCommentSvg'); -/* eslint-disable-next-line no-unused-vars */ -const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); const eventUtils = goog.require('Blockly.Events.utils'); const mathUtils = goog.require('Blockly.utils.math'); /* eslint-disable-next-line no-unused-vars */ const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); +/* eslint-disable-next-line no-unused-vars */ +const {IBoundedElement} = goog.requireType('Blockly.IBoundedElement'); +/* eslint-disable-next-line no-unused-vars */ +const {MetricsManager} = goog.requireType('Blockly.MetricsManager'); +/* eslint-disable-next-line no-unused-vars */ +const {ViewportChange} = goog.requireType('Blockly.Events.ViewportChange'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceCommentSvg} = goog.requireType('Blockly.WorkspaceCommentSvg'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg'); /** diff --git a/core/clipboard.js b/core/clipboard.js index a79c4c53b..ee7ef2a54 100644 --- a/core/clipboard.js +++ b/core/clipboard.js @@ -15,9 +15,9 @@ */ goog.module('Blockly.clipboard'); -/* eslint-disable-next-line no-unused-vars */ -const ICopyable = goog.requireType('Blockly.ICopyable'); const eventUtils = goog.require('Blockly.Events.utils'); +/* eslint-disable-next-line no-unused-vars */ +const {ICopyable} = goog.requireType('Blockly.ICopyable'); /** diff --git a/core/comment.js b/core/comment.js index db375cefa..c38423fae 100644 --- a/core/comment.js +++ b/core/comment.js @@ -15,25 +15,25 @@ */ goog.module('Blockly.Comment'); -const Bubble = goog.require('Blockly.Bubble'); -/* eslint-disable-next-line no-unused-vars */ -const Coordinate = goog.requireType('Blockly.utils.Coordinate'); const Css = goog.require('Blockly.Css'); -const Icon = goog.require('Blockly.Icon'); -/* eslint-disable-next-line no-unused-vars */ -const Size = goog.requireType('Blockly.utils.Size'); -const Svg = goog.require('Blockly.utils.Svg'); -/* eslint-disable-next-line no-unused-vars */ -const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); const browserEvents = goog.require('Blockly.browserEvents'); const dom = goog.require('Blockly.utils.dom'); const eventUtils = goog.require('Blockly.Events.utils'); 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'); +/* eslint-disable-next-line no-unused-vars */ +const {Block} = goog.requireType('Blockly.Block'); +const {Bubble} = goog.require('Blockly.Bubble'); +/* eslint-disable-next-line no-unused-vars */ +const {Coordinate} = goog.requireType('Blockly.utils.Coordinate'); +const {Icon} = goog.require('Blockly.Icon'); +/* eslint-disable-next-line no-unused-vars */ +const {Size} = goog.requireType('Blockly.utils.Size'); +const {Svg} = goog.require('Blockly.utils.Svg'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.BlockChange'); /** @suppress {extraRequire} */ @@ -414,4 +414,4 @@ Css.register(` } `); -exports = Comment; +exports.Comment = Comment; diff --git a/core/common.js b/core/common.js index 2335a6493..1d6bee818 100644 --- a/core/common.js +++ b/core/common.js @@ -18,13 +18,13 @@ goog.module('Blockly.common'); /* eslint-disable-next-line no-unused-vars */ -const Connection = goog.requireType('Blockly.Connection'); +const {Connection} = goog.requireType('Blockly.Connection'); /* eslint-disable-next-line no-unused-vars */ -const ICopyable = goog.requireType('Blockly.ICopyable'); +const {ICopyable} = goog.requireType('Blockly.ICopyable'); /* eslint-disable-next-line no-unused-vars */ -const Workspace = goog.requireType('Blockly.Workspace'); +const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg'); /* eslint-disable-next-line no-unused-vars */ -const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); +const {Workspace} = goog.requireType('Blockly.Workspace'); /** diff --git a/core/component_manager.js b/core/component_manager.js index 7f2447a00..1f3512c3b 100644 --- a/core/component_manager.js +++ b/core/component_manager.js @@ -16,17 +16,17 @@ */ goog.module('Blockly.ComponentManager'); -/* eslint-disable-next-line no-unused-vars */ -const IAutoHideable = goog.requireType('Blockly.IAutoHideable'); -/* eslint-disable-next-line no-unused-vars */ -const IComponent = goog.requireType('Blockly.IComponent'); -/* eslint-disable-next-line no-unused-vars */ -const IDeleteArea = goog.requireType('Blockly.IDeleteArea'); -/* eslint-disable-next-line no-unused-vars */ -const IDragTarget = goog.requireType('Blockly.IDragTarget'); -/* eslint-disable-next-line no-unused-vars */ -const IPositionable = goog.requireType('Blockly.IPositionable'); const utils = goog.require('Blockly.utils'); +/* eslint-disable-next-line no-unused-vars */ +const {IAutoHideable} = goog.requireType('Blockly.IAutoHideable'); +/* eslint-disable-next-line no-unused-vars */ +const {IComponent} = goog.requireType('Blockly.IComponent'); +/* eslint-disable-next-line no-unused-vars */ +const {IDeleteArea} = goog.requireType('Blockly.IDeleteArea'); +/* eslint-disable-next-line no-unused-vars */ +const {IDragTarget} = goog.requireType('Blockly.IDragTarget'); +/* eslint-disable-next-line no-unused-vars */ +const {IPositionable} = goog.requireType('Blockly.IPositionable'); /** @@ -253,4 +253,4 @@ ComponentManager.Capability.DELETE_AREA = ComponentManager.Capability.AUTOHIDEABLE = new ComponentManager.Capability('autohideable'); -exports = ComponentManager; +exports.ComponentManager = ComponentManager; diff --git a/core/connection.js b/core/connection.js index 21754d203..d15c365d2 100644 --- a/core/connection.js +++ b/core/connection.js @@ -15,12 +15,6 @@ */ goog.module('Blockly.Connection'); -/* eslint-disable-next-line no-unused-vars */ -const IASTNodeLocationWithBlock = goog.require('Blockly.IASTNodeLocationWithBlock'); -/* eslint-disable-next-line no-unused-vars */ -const IConnectionChecker = goog.requireType('Blockly.IConnectionChecker'); -/* eslint-disable-next-line no-unused-vars */ -const Input = goog.requireType('Blockly.Input'); const Xml = goog.require('Blockly.Xml'); const blocks = goog.require('Blockly.serialization.blocks'); const deprecation = goog.require('Blockly.utils.deprecation'); @@ -28,10 +22,16 @@ const eventUtils = goog.require('Blockly.Events.utils'); /* eslint-disable-next-line no-unused-vars */ const {Block} = goog.requireType('Blockly.Block'); const {ConnectionType} = goog.require('Blockly.ConnectionType'); -/** @suppress {extraRequire} */ -goog.require('Blockly.constants'); +/* eslint-disable-next-line no-unused-vars */ +const {IASTNodeLocationWithBlock} = goog.require('Blockly.IASTNodeLocationWithBlock'); +/* eslint-disable-next-line no-unused-vars */ +const {IConnectionChecker} = goog.requireType('Blockly.IConnectionChecker'); +/* eslint-disable-next-line no-unused-vars */ +const {Input} = goog.requireType('Blockly.Input'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.BlockMove'); +/** @suppress {extraRequire} */ +goog.require('Blockly.constants'); /** @@ -808,4 +808,4 @@ Connection.prototype.serializeShadow_ = function(shadow) { this.shadowState_ = blocks.save(shadow); }; -exports = Connection; +exports.Connection = Connection; diff --git a/core/connection_checker.js b/core/connection_checker.js index bf6afcb9c..93cd92d7b 100644 --- a/core/connection_checker.js +++ b/core/connection_checker.js @@ -17,15 +17,15 @@ */ goog.module('Blockly.ConnectionChecker'); -const Connection = goog.require('Blockly.Connection'); -/* eslint-disable-next-line no-unused-vars */ -const IConnectionChecker = goog.require('Blockly.IConnectionChecker'); -/* eslint-disable-next-line no-unused-vars */ -const RenderedConnection = goog.requireType('Blockly.RenderedConnection'); const common = goog.require('Blockly.common'); const internalConstants = goog.require('Blockly.internalConstants'); const registry = goog.require('Blockly.registry'); const {ConnectionType} = goog.require('Blockly.ConnectionType'); +const {Connection} = goog.require('Blockly.Connection'); +/* eslint-disable-next-line no-unused-vars */ +const {IConnectionChecker} = goog.require('Blockly.IConnectionChecker'); +/* eslint-disable-next-line no-unused-vars */ +const {RenderedConnection} = goog.requireType('Blockly.RenderedConnection'); /** @@ -290,4 +290,4 @@ ConnectionChecker.prototype.canConnectToPrevious_ = function(a, b) { registry.register( registry.Type.CONNECTION_CHECKER, registry.DEFAULT, ConnectionChecker); -exports = ConnectionChecker; +exports.ConnectionChecker = ConnectionChecker; diff --git a/core/connection_db.js b/core/connection_db.js index 39cbf844c..35c1363a1 100644 --- a/core/connection_db.js +++ b/core/connection_db.js @@ -19,13 +19,13 @@ */ goog.module('Blockly.ConnectionDB'); -/* eslint-disable-next-line no-unused-vars */ -const Coordinate = goog.requireType('Blockly.utils.Coordinate'); -/* eslint-disable-next-line no-unused-vars */ -const IConnectionChecker = goog.requireType('Blockly.IConnectionChecker'); -/* eslint-disable-next-line no-unused-vars */ -const RenderedConnection = goog.requireType('Blockly.RenderedConnection'); const {ConnectionType} = goog.require('Blockly.ConnectionType'); +/* eslint-disable-next-line no-unused-vars */ +const {Coordinate} = goog.requireType('Blockly.utils.Coordinate'); +/* eslint-disable-next-line no-unused-vars */ +const {IConnectionChecker} = goog.requireType('Blockly.IConnectionChecker'); +/* eslint-disable-next-line no-unused-vars */ +const {RenderedConnection} = goog.requireType('Blockly.RenderedConnection'); /** @suppress {extraRequire} */ goog.require('Blockly.constants'); @@ -306,4 +306,4 @@ ConnectionDB.init = function(checker) { return dbList; }; -exports = ConnectionDB; +exports.ConnectionDB = ConnectionDB; diff --git a/core/contextmenu.js b/core/contextmenu.js index c025a3ca5..03e39bfe5 100644 --- a/core/contextmenu.js +++ b/core/contextmenu.js @@ -15,13 +15,7 @@ */ goog.module('Blockly.ContextMenu'); -/* eslint-disable-next-line no-unused-vars */ -const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); -const Coordinate = goog.require('Blockly.utils.Coordinate'); -const Menu = goog.require('Blockly.Menu'); -const MenuItem = goog.require('Blockly.MenuItem'); const Msg = goog.require('Blockly.Msg'); -const Rect = goog.require('Blockly.utils.Rect'); const WidgetDiv = goog.require('Blockly.WidgetDiv'); const Xml = goog.require('Blockly.Xml'); const aria = goog.require('Blockly.utils.aria'); @@ -35,8 +29,14 @@ 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'); +const {Coordinate} = goog.require('Blockly.utils.Coordinate'); +const {MenuItem} = goog.require('Blockly.MenuItem'); +const {Menu} = goog.require('Blockly.Menu'); +const {Rect} = goog.require('Blockly.utils.Rect'); /* eslint-disable-next-line no-unused-vars */ -const WorkspaceCommentSvg = goog.requireType('Blockly.WorkspaceCommentSvg'); +const {WorkspaceCommentSvg} = goog.requireType('Blockly.WorkspaceCommentSvg'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.BlockCreate'); diff --git a/core/contextmenu_items.js b/core/contextmenu_items.js index e2e8bcd58..ccb7f72e2 100644 --- a/core/contextmenu_items.js +++ b/core/contextmenu_items.js @@ -15,19 +15,19 @@ */ goog.module('Blockly.ContextMenuItems'); -const ContextMenuRegistry = goog.require('Blockly.ContextMenuRegistry'); const Events = goog.require('Blockly.Events'); const Msg = goog.require('Blockly.Msg'); -/* eslint-disable-next-line no-unused-vars */ -const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); const clipboard = goog.require('Blockly.clipboard'); const dialog = goog.require('Blockly.dialog'); const eventUtils = goog.require('Blockly.Events.utils'); 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'); +const {ContextMenuRegistry} = goog.require('Blockly.ContextMenuRegistry'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg'); +const {inputTypes} = goog.require('Blockly.inputTypes'); /** diff --git a/core/contextmenu_registry.js b/core/contextmenu_registry.js index 05365ea25..91a015c3b 100644 --- a/core/contextmenu_registry.js +++ b/core/contextmenu_registry.js @@ -15,10 +15,10 @@ */ goog.module('Blockly.ContextMenuRegistry'); -/* 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'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg'); /** @@ -171,4 +171,4 @@ ContextMenuRegistry.prototype.getContextMenuOptions = function( // Creates and assigns the singleton instance. new ContextMenuRegistry(); -exports = ContextMenuRegistry; +exports.ContextMenuRegistry = ContextMenuRegistry; diff --git a/core/delete_area.js b/core/delete_area.js index ce971a630..b856d8a97 100644 --- a/core/delete_area.js +++ b/core/delete_area.js @@ -18,13 +18,13 @@ */ goog.module('Blockly.DeleteArea'); -const DragTarget = goog.require('Blockly.DragTarget'); -/* eslint-disable-next-line no-unused-vars */ -const IDeleteArea = goog.require('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'); +const {DragTarget} = goog.require('Blockly.DragTarget'); +/* eslint-disable-next-line no-unused-vars */ +const {IDeleteArea} = goog.require('Blockly.IDeleteArea'); +/* eslint-disable-next-line no-unused-vars */ +const {IDraggable} = goog.requireType('Blockly.IDraggable'); /** @@ -81,4 +81,4 @@ DeleteArea.prototype.updateWouldDelete_ = function(wouldDelete) { this.wouldDelete_ = wouldDelete; }; -exports = DeleteArea; +exports.DeleteArea = DeleteArea; diff --git a/core/drag_target.js b/core/drag_target.js index 8ddafd4da..f552586bd 100644 --- a/core/drag_target.js +++ b/core/drag_target.js @@ -19,11 +19,11 @@ goog.module('Blockly.DragTarget'); /* eslint-disable-next-line no-unused-vars */ -const IDragTarget = goog.require('Blockly.IDragTarget'); +const {IDragTarget} = goog.require('Blockly.IDragTarget'); /* eslint-disable-next-line no-unused-vars */ -const IDraggable = goog.requireType('Blockly.IDraggable'); +const {IDraggable} = goog.requireType('Blockly.IDraggable'); /* eslint-disable-next-line no-unused-vars */ -const Rect = goog.requireType('Blockly.utils.Rect'); +const {Rect} = goog.requireType('Blockly.utils.Rect'); /** @@ -94,4 +94,4 @@ DragTarget.prototype.shouldPreventMove = function(_dragElement) { return false; }; -exports = DragTarget; +exports.DragTarget = DragTarget; diff --git a/core/dropdowndiv.js b/core/dropdowndiv.js index bf2147b39..bc1ef06b5 100644 --- a/core/dropdowndiv.js +++ b/core/dropdowndiv.js @@ -18,19 +18,19 @@ */ goog.module('Blockly.DropDownDiv'); -const Rect = goog.require('Blockly.utils.Rect'); -/* eslint-disable-next-line no-unused-vars */ -const Field = goog.requireType('Blockly.Field'); -/* 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 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'); +/* eslint-disable-next-line no-unused-vars */ +const {Field} = goog.requireType('Blockly.Field'); +const {Rect} = goog.require('Blockly.utils.Rect'); +/* 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'); /** @@ -759,6 +759,7 @@ DropDownDiv.repositionForWindowResize = function() { DropDownDiv.hide(); } }; -exports = DropDownDiv; -exports.TEST_ONLY = internal; +DropDownDiv.TEST_ONLY = internal; + +exports.DropDownDiv = DropDownDiv; diff --git a/core/events/events.js b/core/events/events.js index edcae762e..7fd3c21df 100644 --- a/core/events/events.js +++ b/core/events/events.js @@ -16,34 +16,34 @@ goog.module('Blockly.Events'); const Abstract = goog.require('Blockly.Events.Abstract'); -const BlockBase = goog.require('Blockly.Events.BlockBase'); -const BlockChange = goog.require('Blockly.Events.BlockChange'); -const BlockCreate = goog.require('Blockly.Events.BlockCreate'); -const BlockDelete = goog.require('Blockly.Events.BlockDelete'); -const BlockDrag = goog.require('Blockly.Events.BlockDrag'); -const BlockMove = goog.require('Blockly.Events.BlockMove'); -const BubbleOpen = goog.require('Blockly.Events.BubbleOpen'); -const Click = goog.require('Blockly.Events.Click'); -const CommentBase = goog.require('Blockly.Events.CommentBase'); -const CommentChange = goog.require('Blockly.Events.CommentChange'); -const CommentCreate = goog.require('Blockly.Events.CommentCreate'); -const CommentDelete = goog.require('Blockly.Events.CommentDelete'); -const CommentMove = goog.require('Blockly.Events.CommentMove'); -const FinishedLoading = goog.require('Blockly.Events.FinishedLoading'); -const MarkerMove = goog.require('Blockly.Events.MarkerMove'); -const Selected = goog.require('Blockly.Events.Selected'); -const ThemeChange = goog.require('Blockly.Events.ThemeChange'); -const ToolboxItemSelect = goog.require('Blockly.Events.ToolboxItemSelect'); -const TrashcanOpen = goog.require('Blockly.Events.TrashcanOpen'); -const Ui = goog.require('Blockly.Events.Ui'); -const UiBase = goog.require('Blockly.Events.UiBase'); -const VarBase = goog.require('Blockly.Events.VarBase'); -const VarCreate = goog.require('Blockly.Events.VarCreate'); -const VarDelete = goog.require('Blockly.Events.VarDelete'); -const VarRename = goog.require('Blockly.Events.VarRename'); -const ViewportChange = goog.require('Blockly.Events.ViewportChange'); const deprecation = goog.require('Blockly.utils.deprecation'); const eventUtils = goog.require('Blockly.Events.utils'); +const {BlockBase} = goog.require('Blockly.Events.BlockBase'); +const {BlockChange} = goog.require('Blockly.Events.BlockChange'); +const {BlockCreate} = goog.require('Blockly.Events.BlockCreate'); +const {BlockDelete} = goog.require('Blockly.Events.BlockDelete'); +const {BlockDrag} = goog.require('Blockly.Events.BlockDrag'); +const {BlockMove} = goog.require('Blockly.Events.BlockMove'); +const {BubbleOpen} = goog.require('Blockly.Events.BubbleOpen'); +const {Click} = goog.require('Blockly.Events.Click'); +const {CommentBase} = goog.require('Blockly.Events.CommentBase'); +const {CommentChange} = goog.require('Blockly.Events.CommentChange'); +const {CommentCreate} = goog.require('Blockly.Events.CommentCreate'); +const {CommentDelete} = goog.require('Blockly.Events.CommentDelete'); +const {CommentMove} = goog.require('Blockly.Events.CommentMove'); +const {FinishedLoading} = goog.require('Blockly.Events.FinishedLoading'); +const {MarkerMove} = goog.require('Blockly.Events.MarkerMove'); +const {Selected} = goog.require('Blockly.Events.Selected'); +const {ThemeChange} = goog.require('Blockly.Events.ThemeChange'); +const {ToolboxItemSelect} = goog.require('Blockly.Events.ToolboxItemSelect'); +const {TrashcanOpen} = goog.require('Blockly.Events.TrashcanOpen'); +const {UiBase} = goog.require('Blockly.Events.UiBase'); +const {Ui} = goog.require('Blockly.Events.Ui'); +const {VarBase} = goog.require('Blockly.Events.VarBase'); +const {VarCreate} = goog.require('Blockly.Events.VarCreate'); +const {VarDelete} = goog.require('Blockly.Events.VarDelete'); +const {VarRename} = goog.require('Blockly.Events.VarRename'); +const {ViewportChange} = goog.require('Blockly.Events.ViewportChange'); // Events. diff --git a/core/events/events_abstract.js b/core/events/events_abstract.js index 79fc36dcb..d88d8efab 100644 --- a/core/events/events_abstract.js +++ b/core/events/events_abstract.js @@ -19,7 +19,7 @@ goog.module('Blockly.Events.Abstract'); const eventUtils = goog.require('Blockly.Events.utils'); /* eslint-disable-next-line no-unused-vars */ -const Workspace = goog.requireType('Blockly.Workspace'); +const {Workspace} = goog.requireType('Blockly.Workspace'); /** @@ -107,7 +107,8 @@ Abstract.prototype.run = function(_forward) { Abstract.prototype.getEventWorkspace_ = function() { let workspace; if (this.workspaceId) { - workspace = goog.module.get('Blockly.Workspace').getById(this.workspaceId); + const {Workspace} = goog.module.get('Blockly.Workspace'); + workspace = Workspace.getById(this.workspaceId); } if (!workspace) { throw Error( diff --git a/core/events/events_block_base.js b/core/events/events_block_base.js index 934ea1350..c243575fa 100644 --- a/core/events/events_block_base.js +++ b/core/events/events_block_base.js @@ -66,4 +66,4 @@ BlockBase.prototype.fromJson = function(json) { this.blockId = json['blockId']; }; -exports = BlockBase; +exports.BlockBase = BlockBase; diff --git a/core/events/events_block_change.js b/core/events/events_block_change.js index e56db3b32..4b7ed2b0a 100644 --- a/core/events/events_block_change.js +++ b/core/events/events_block_change.js @@ -15,15 +15,15 @@ */ goog.module('Blockly.Events.BlockChange'); -const BlockBase = goog.require('Blockly.Events.BlockBase'); const Xml = goog.require('Blockly.Xml'); const eventUtils = goog.require('Blockly.Events.utils'); const object = goog.require('Blockly.utils.object'); const registry = goog.require('Blockly.registry'); -/* eslint-disable-next-line no-unused-vars */ -const {Block} = goog.requireType('Blockly.Block'); +const {BlockBase} = goog.require('Blockly.Events.BlockBase'); /* eslint-disable-next-line no-unused-vars */ const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); +/* eslint-disable-next-line no-unused-vars */ +const {Block} = goog.requireType('Blockly.Block'); /** @@ -169,4 +169,4 @@ BlockChange.getExtraBlockState_ = function(block) { registry.register(registry.Type.EVENT, eventUtils.CHANGE, BlockChange); -exports = BlockChange; +exports.BlockChange = BlockChange; diff --git a/core/events/events_block_create.js b/core/events/events_block_create.js index d421ad2a9..1300e0c60 100644 --- a/core/events/events_block_create.js +++ b/core/events/events_block_create.js @@ -15,12 +15,12 @@ */ goog.module('Blockly.Events.BlockCreate'); -const BlockBase = goog.require('Blockly.Events.BlockBase'); const Xml = goog.require('Blockly.Xml'); const blocks = goog.require('Blockly.serialization.blocks'); const eventUtils = goog.require('Blockly.Events.utils'); const object = goog.require('Blockly.utils.object'); const registry = goog.require('Blockly.registry'); +const {BlockBase} = goog.require('Blockly.Events.BlockBase'); /* eslint-disable-next-line no-unused-vars */ const {Block} = goog.requireType('Blockly.Block'); @@ -114,4 +114,4 @@ BlockCreate.prototype.run = function(forward) { registry.register(registry.Type.EVENT, eventUtils.CREATE, BlockCreate); -exports = BlockCreate; +exports.BlockCreate = BlockCreate; diff --git a/core/events/events_block_delete.js b/core/events/events_block_delete.js index 2db3dcbcf..d1333c9ba 100644 --- a/core/events/events_block_delete.js +++ b/core/events/events_block_delete.js @@ -15,12 +15,12 @@ */ goog.module('Blockly.Events.BlockDelete'); -const BlockBase = goog.require('Blockly.Events.BlockBase'); const Xml = goog.require('Blockly.Xml'); const blocks = goog.require('Blockly.serialization.blocks'); const eventUtils = goog.require('Blockly.Events.utils'); const object = goog.require('Blockly.utils.object'); const registry = goog.require('Blockly.registry'); +const {BlockBase} = goog.require('Blockly.Events.BlockBase'); /* eslint-disable-next-line no-unused-vars */ const {Block} = goog.requireType('Blockly.Block'); @@ -126,4 +126,4 @@ BlockDelete.prototype.run = function(forward) { registry.register(registry.Type.EVENT, eventUtils.DELETE, BlockDelete); -exports = BlockDelete; +exports.BlockDelete = BlockDelete; diff --git a/core/events/events_block_drag.js b/core/events/events_block_drag.js index 4e7f09b80..432246eb8 100644 --- a/core/events/events_block_drag.js +++ b/core/events/events_block_drag.js @@ -15,12 +15,12 @@ */ goog.module('Blockly.Events.BlockDrag'); -const UiBase = goog.require('Blockly.Events.UiBase'); const eventUtils = goog.require('Blockly.Events.utils'); const object = goog.require('Blockly.utils.object'); const registry = goog.require('Blockly.registry'); /* eslint-disable-next-line no-unused-vars */ const {Block} = goog.requireType('Blockly.Block'); +const {UiBase} = goog.require('Blockly.Events.UiBase'); /** @@ -85,4 +85,4 @@ BlockDrag.prototype.fromJson = function(json) { registry.register(registry.Type.EVENT, eventUtils.BLOCK_DRAG, BlockDrag); -exports = BlockDrag; +exports.BlockDrag = BlockDrag; diff --git a/core/events/events_block_move.js b/core/events/events_block_move.js index 4cf7db822..a1abf2a4f 100644 --- a/core/events/events_block_move.js +++ b/core/events/events_block_move.js @@ -15,14 +15,14 @@ */ goog.module('Blockly.Events.BlockMove'); -const BlockBase = goog.require('Blockly.Events.BlockBase'); -const Coordinate = goog.require('Blockly.utils.Coordinate'); const eventUtils = goog.require('Blockly.Events.utils'); const object = goog.require('Blockly.utils.object'); const registry = goog.require('Blockly.registry'); +const {BlockBase} = goog.require('Blockly.Events.BlockBase'); /* eslint-disable-next-line no-unused-vars */ const {Block} = goog.requireType('Blockly.Block'); const {ConnectionType} = goog.require('Blockly.ConnectionType'); +const {Coordinate} = goog.require('Blockly.utils.Coordinate'); /** @@ -188,4 +188,4 @@ BlockMove.prototype.run = function(forward) { registry.register(registry.Type.EVENT, eventUtils.MOVE, BlockMove); -exports = BlockMove; +exports.BlockMove = BlockMove; diff --git a/core/events/events_bubble_open.js b/core/events/events_bubble_open.js index 7d09370d7..9c76fd751 100644 --- a/core/events/events_bubble_open.js +++ b/core/events/events_bubble_open.js @@ -15,12 +15,12 @@ */ goog.module('Blockly.Events.BubbleOpen'); -const UiBase = goog.require('Blockly.Events.UiBase'); const eventUtils = goog.require('Blockly.Events.utils'); const object = goog.require('Blockly.utils.object'); const registry = goog.require('Blockly.registry'); /* eslint-disable-next-line no-unused-vars */ const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); +const {UiBase} = goog.require('Blockly.Events.UiBase'); /** @@ -86,4 +86,4 @@ BubbleOpen.prototype.fromJson = function(json) { registry.register(registry.Type.EVENT, eventUtils.BUBBLE_OPEN, BubbleOpen); -exports = BubbleOpen; +exports.BubbleOpen = BubbleOpen; diff --git a/core/events/events_click.js b/core/events/events_click.js index abcdc29ee..0bc9aa972 100644 --- a/core/events/events_click.js +++ b/core/events/events_click.js @@ -15,12 +15,12 @@ */ goog.module('Blockly.Events.Click'); -const UiBase = goog.require('Blockly.Events.UiBase'); const eventUtils = goog.require('Blockly.Events.utils'); const object = goog.require('Blockly.utils.object'); const registry = goog.require('Blockly.registry'); /* eslint-disable-next-line no-unused-vars */ const {Block} = goog.requireType('Blockly.Block'); +const {UiBase} = goog.require('Blockly.Events.UiBase'); /** @@ -80,4 +80,4 @@ Click.prototype.fromJson = function(json) { registry.register(registry.Type.EVENT, eventUtils.CLICK, Click); -exports = Click; +exports.Click = Click; diff --git a/core/events/events_comment_base.js b/core/events/events_comment_base.js index d70fb6a41..63de88dfe 100644 --- a/core/events/events_comment_base.js +++ b/core/events/events_comment_base.js @@ -16,16 +16,16 @@ goog.module('Blockly.Events.CommentBase'); const AbstractEvents = goog.require('Blockly.Events.Abstract'); -/* eslint-disable-next-line no-unused-vars */ -const CommentCreate = goog.requireType('Blockly.Events.CommentCreate'); -/* eslint-disable-next-line no-unused-vars */ -const CommentDelete = goog.requireType('Blockly.Events.CommentDelete'); -/* eslint-disable-next-line no-unused-vars */ -const WorkspaceComment = goog.requireType('Blockly.WorkspaceComment'); const Xml = goog.require('Blockly.Xml'); const eventUtils = goog.require('Blockly.Events.utils'); const object = goog.require('Blockly.utils.object'); const utilsXml = goog.require('Blockly.utils.xml'); +/* eslint-disable-next-line no-unused-vars */ +const {CommentCreate} = goog.requireType('Blockly.Events.CommentCreate'); +/* eslint-disable-next-line no-unused-vars */ +const {CommentDelete} = goog.requireType('Blockly.Events.CommentDelete'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceComment} = goog.requireType('Blockly.WorkspaceComment'); /** @@ -115,4 +115,4 @@ CommentBase.CommentCreateDeleteHelper = function(event, create) { } }; -exports = CommentBase; +exports.CommentBase = CommentBase; diff --git a/core/events/events_comment_change.js b/core/events/events_comment_change.js index a2ae2d385..fef6f4150 100644 --- a/core/events/events_comment_change.js +++ b/core/events/events_comment_change.js @@ -15,12 +15,12 @@ */ goog.module('Blockly.Events.CommentChange'); -const CommentBase = goog.require('Blockly.Events.CommentBase'); -/* eslint-disable-next-line no-unused-vars */ -const WorkspaceComment = goog.requireType('Blockly.WorkspaceComment'); const eventUtils = goog.require('Blockly.Events.utils'); const object = goog.require('Blockly.utils.object'); const registry = goog.require('Blockly.registry'); +const {CommentBase} = goog.require('Blockly.Events.CommentBase'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceComment} = goog.requireType('Blockly.WorkspaceComment'); /** @@ -99,4 +99,4 @@ CommentChange.prototype.run = function(forward) { registry.register(registry.Type.EVENT, eventUtils.COMMENT_CHANGE, CommentChange); -exports = CommentChange; +exports.CommentChange = CommentChange; diff --git a/core/events/events_comment_create.js b/core/events/events_comment_create.js index a3ac9ab1e..c82fc24a5 100644 --- a/core/events/events_comment_create.js +++ b/core/events/events_comment_create.js @@ -15,13 +15,13 @@ */ goog.module('Blockly.Events.CommentCreate'); -const CommentBase = goog.require('Blockly.Events.CommentBase'); -/* eslint-disable-next-line no-unused-vars */ -const WorkspaceComment = goog.requireType('Blockly.WorkspaceComment'); const Xml = goog.require('Blockly.Xml'); const eventUtils = goog.require('Blockly.Events.utils'); const object = goog.require('Blockly.utils.object'); const registry = goog.require('Blockly.registry'); +const {CommentBase} = goog.require('Blockly.Events.CommentBase'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceComment} = goog.requireType('Blockly.WorkspaceComment'); /** @@ -78,4 +78,4 @@ CommentCreate.prototype.run = function(forward) { registry.register(registry.Type.EVENT, eventUtils.COMMENT_CREATE, CommentCreate); -exports = CommentCreate; +exports.CommentCreate = CommentCreate; diff --git a/core/events/events_comment_delete.js b/core/events/events_comment_delete.js index 19685f825..d4dba4433 100644 --- a/core/events/events_comment_delete.js +++ b/core/events/events_comment_delete.js @@ -15,12 +15,12 @@ */ goog.module('Blockly.Events.CommentDelete'); -const CommentBase = goog.require('Blockly.Events.CommentBase'); -/* eslint-disable-next-line no-unused-vars */ -const WorkspaceComment = goog.requireType('Blockly.WorkspaceComment'); const eventUtils = goog.require('Blockly.Events.utils'); const object = goog.require('Blockly.utils.object'); const registry = goog.require('Blockly.registry'); +const {CommentBase} = goog.require('Blockly.Events.CommentBase'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceComment} = goog.requireType('Blockly.WorkspaceComment'); /** @@ -75,4 +75,4 @@ CommentDelete.prototype.run = function(forward) { registry.register(registry.Type.EVENT, eventUtils.COMMENT_DELETE, CommentDelete); -exports = CommentDelete; +exports.CommentDelete = CommentDelete; diff --git a/core/events/events_comment_move.js b/core/events/events_comment_move.js index 89686ac15..51ba01ab6 100644 --- a/core/events/events_comment_move.js +++ b/core/events/events_comment_move.js @@ -15,13 +15,13 @@ */ goog.module('Blockly.Events.CommentMove'); -const CommentBase = goog.require('Blockly.Events.CommentBase'); -const Coordinate = goog.require('Blockly.utils.Coordinate'); -/* eslint-disable-next-line no-unused-vars */ -const WorkspaceComment = goog.requireType('Blockly.WorkspaceComment'); const eventUtils = goog.require('Blockly.Events.utils'); const object = goog.require('Blockly.utils.object'); const registry = goog.require('Blockly.registry'); +const {CommentBase} = goog.require('Blockly.Events.CommentBase'); +const {Coordinate} = goog.require('Blockly.utils.Coordinate'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceComment} = goog.requireType('Blockly.WorkspaceComment'); /** @@ -152,4 +152,4 @@ CommentMove.prototype.run = function(forward) { registry.register(registry.Type.EVENT, eventUtils.COMMENT_MOVE, CommentMove); -exports = CommentMove; +exports.CommentMove = CommentMove; diff --git a/core/events/events_marker_move.js b/core/events/events_marker_move.js index c1a0d4ea2..97f473d95 100644 --- a/core/events/events_marker_move.js +++ b/core/events/events_marker_move.js @@ -15,15 +15,15 @@ */ goog.module('Blockly.Events.MarkerMove'); -const UiBase = goog.require('Blockly.Events.UiBase'); -/* eslint-disable-next-line no-unused-vars */ -const Workspace = goog.requireType('Blockly.Workspace'); const eventUtils = goog.require('Blockly.Events.utils'); const object = goog.require('Blockly.utils.object'); const registry = goog.require('Blockly.registry'); const {ASTNode} = goog.require('Blockly.ASTNode'); /* eslint-disable-next-line no-unused-vars */ const {Block} = goog.requireType('Blockly.Block'); +const {UiBase} = goog.require('Blockly.Events.UiBase'); +/* eslint-disable-next-line no-unused-vars */ +const {Workspace} = goog.requireType('Blockly.Workspace'); /** @@ -106,4 +106,4 @@ MarkerMove.prototype.fromJson = function(json) { registry.register(registry.Type.EVENT, eventUtils.MARKER_MOVE, MarkerMove); -exports = MarkerMove; +exports.MarkerMove = MarkerMove; diff --git a/core/events/events_selected.js b/core/events/events_selected.js index 8d039f95f..7009a8549 100644 --- a/core/events/events_selected.js +++ b/core/events/events_selected.js @@ -15,10 +15,10 @@ */ goog.module('Blockly.Events.Selected'); -const UiBase = goog.require('Blockly.Events.UiBase'); -const object = goog.require('Blockly.utils.object'); const eventUtils = goog.require('Blockly.Events.utils'); +const object = goog.require('Blockly.utils.object'); const registry = goog.require('Blockly.registry'); +const {UiBase} = goog.require('Blockly.Events.UiBase'); /** @@ -79,4 +79,4 @@ Selected.prototype.fromJson = function(json) { registry.register(registry.Type.EVENT, eventUtils.SELECTED, Selected); -exports = Selected; +exports.Selected = Selected; diff --git a/core/events/events_theme_change.js b/core/events/events_theme_change.js index 7a4338594..e1cba44c2 100644 --- a/core/events/events_theme_change.js +++ b/core/events/events_theme_change.js @@ -15,10 +15,10 @@ */ goog.module('Blockly.Events.ThemeChange'); -const UiBase = goog.require('Blockly.Events.UiBase'); const eventUtils = goog.require('Blockly.Events.utils'); const object = goog.require('Blockly.utils.object'); const registry = goog.require('Blockly.registry'); +const {UiBase} = goog.require('Blockly.Events.UiBase'); /** @@ -68,4 +68,4 @@ ThemeChange.prototype.fromJson = function(json) { registry.register(registry.Type.EVENT, eventUtils.THEME_CHANGE, ThemeChange); -exports = ThemeChange; +exports.ThemeChange = ThemeChange; diff --git a/core/events/events_toolbox_item_select.js b/core/events/events_toolbox_item_select.js index 3e61d1a4e..f2ba9bf19 100644 --- a/core/events/events_toolbox_item_select.js +++ b/core/events/events_toolbox_item_select.js @@ -15,10 +15,10 @@ */ goog.module('Blockly.Events.ToolboxItemSelect'); -const UiBase = goog.require('Blockly.Events.UiBase'); const eventUtils = goog.require('Blockly.Events.utils'); const object = goog.require('Blockly.utils.object'); const registry = goog.require('Blockly.registry'); +const {UiBase} = goog.require('Blockly.Events.UiBase'); /** @@ -80,4 +80,4 @@ ToolboxItemSelect.prototype.fromJson = function(json) { registry.register( registry.Type.EVENT, eventUtils.TOOLBOX_ITEM_SELECT, ToolboxItemSelect); -exports = ToolboxItemSelect; +exports.ToolboxItemSelect = ToolboxItemSelect; diff --git a/core/events/events_trashcan_open.js b/core/events/events_trashcan_open.js index 66d6c32d9..21fd0d3b3 100644 --- a/core/events/events_trashcan_open.js +++ b/core/events/events_trashcan_open.js @@ -15,10 +15,10 @@ */ goog.module('Blockly.Events.TrashcanOpen'); -const UiBase = goog.require('Blockly.Events.UiBase'); const eventUtils = goog.require('Blockly.Events.utils'); const object = goog.require('Blockly.utils.object'); const registry = goog.require('Blockly.registry'); +const {UiBase} = goog.require('Blockly.Events.UiBase'); /** @@ -69,4 +69,4 @@ TrashcanOpen.prototype.fromJson = function(json) { registry.register(registry.Type.EVENT, eventUtils.TRASHCAN_OPEN, TrashcanOpen); -exports = TrashcanOpen; +exports.TrashcanOpen = TrashcanOpen; diff --git a/core/events/events_ui.js b/core/events/events_ui.js index 5a0cc9fe7..b505d3b20 100644 --- a/core/events/events_ui.js +++ b/core/events/events_ui.js @@ -17,12 +17,12 @@ */ goog.module('Blockly.Events.Ui'); -const UiBase = goog.require('Blockly.Events.UiBase'); const eventUtils = goog.require('Blockly.Events.utils'); const object = goog.require('Blockly.utils.object'); const registry = goog.require('Blockly.registry'); /* eslint-disable-next-line no-unused-vars */ const {Block} = goog.requireType('Blockly.Block'); +const {UiBase} = goog.require('Blockly.Events.UiBase'); /** @@ -84,4 +84,4 @@ Ui.prototype.fromJson = function(json) { registry.register(registry.Type.EVENT, eventUtils.UI, Ui); -exports = Ui; +exports.Ui = Ui; diff --git a/core/events/events_ui_base.js b/core/events/events_ui_base.js index e6be8c215..1618f2876 100644 --- a/core/events/events_ui_base.js +++ b/core/events/events_ui_base.js @@ -59,4 +59,4 @@ object.inherits(UiBase, Abstract); */ UiBase.prototype.isUiEvent = true; -exports = UiBase; +exports.UiBase = UiBase; diff --git a/core/events/events_var_base.js b/core/events/events_var_base.js index 57451c0f4..fd919a061 100644 --- a/core/events/events_var_base.js +++ b/core/events/events_var_base.js @@ -16,9 +16,9 @@ goog.module('Blockly.Events.VarBase'); const Abstract = goog.require('Blockly.Events.Abstract'); -/* eslint-disable-next-line no-unused-vars */ -const VariableModel = goog.requireType('Blockly.VariableModel'); const object = goog.require('Blockly.utils.object'); +/* eslint-disable-next-line no-unused-vars */ +const {VariableModel} = goog.requireType('Blockly.VariableModel'); /** @@ -66,4 +66,4 @@ VarBase.prototype.fromJson = function(json) { this.varId = json['varId']; }; -exports = VarBase; +exports.VarBase = VarBase; diff --git a/core/events/events_var_create.js b/core/events/events_var_create.js index 135c9d880..f924fd98d 100644 --- a/core/events/events_var_create.js +++ b/core/events/events_var_create.js @@ -15,12 +15,12 @@ */ goog.module('Blockly.Events.VarCreate'); -const VarBase = goog.require('Blockly.Events.VarBase'); -/* eslint-disable-next-line no-unused-vars */ -const VariableModel = goog.requireType('Blockly.VariableModel'); const eventUtils = goog.require('Blockly.Events.utils'); const object = goog.require('Blockly.utils.object'); const registry = goog.require('Blockly.registry'); +const {VarBase} = goog.require('Blockly.Events.VarBase'); +/* eslint-disable-next-line no-unused-vars */ +const {VariableModel} = goog.requireType('Blockly.VariableModel'); /** @@ -84,4 +84,4 @@ VarCreate.prototype.run = function(forward) { registry.register(registry.Type.EVENT, eventUtils.VAR_CREATE, VarCreate); -exports = VarCreate; +exports.VarCreate = VarCreate; diff --git a/core/events/events_var_delete.js b/core/events/events_var_delete.js index f9c5dec22..2c8b34fb2 100644 --- a/core/events/events_var_delete.js +++ b/core/events/events_var_delete.js @@ -15,12 +15,12 @@ */ goog.module('Blockly.Events.VarDelete'); -const VarBase = goog.require('Blockly.Events.VarBase'); -/* eslint-disable-next-line no-unused-vars */ -const VariableModel = goog.requireType('Blockly.VariableModel'); const eventUtils = goog.require('Blockly.Events.utils'); const object = goog.require('Blockly.utils.object'); const registry = goog.require('Blockly.registry'); +const {VarBase} = goog.require('Blockly.Events.VarBase'); +/* eslint-disable-next-line no-unused-vars */ +const {VariableModel} = goog.requireType('Blockly.VariableModel'); /** @@ -84,4 +84,4 @@ VarDelete.prototype.run = function(forward) { registry.register(registry.Type.EVENT, eventUtils.VAR_DELETE, VarDelete); -exports = VarDelete; +exports.VarDelete = VarDelete; diff --git a/core/events/events_var_rename.js b/core/events/events_var_rename.js index 496a5aecf..97d8fd882 100644 --- a/core/events/events_var_rename.js +++ b/core/events/events_var_rename.js @@ -15,12 +15,12 @@ */ goog.module('Blockly.Events.VarRename'); -const VarBase = goog.require('Blockly.Events.VarBase'); -/* eslint-disable-next-line no-unused-vars */ -const VariableModel = goog.requireType('Blockly.VariableModel'); const eventUtils = goog.require('Blockly.Events.utils'); const object = goog.require('Blockly.utils.object'); const registry = goog.require('Blockly.registry'); +const {VarBase} = goog.require('Blockly.Events.VarBase'); +/* eslint-disable-next-line no-unused-vars */ +const {VariableModel} = goog.requireType('Blockly.VariableModel'); /** @@ -85,4 +85,4 @@ VarRename.prototype.run = function(forward) { registry.register(registry.Type.EVENT, eventUtils.VAR_RENAME, VarRename); -exports = VarRename; +exports.VarRename = VarRename; diff --git a/core/events/events_viewport.js b/core/events/events_viewport.js index a7384ab0f..806223e95 100644 --- a/core/events/events_viewport.js +++ b/core/events/events_viewport.js @@ -15,10 +15,10 @@ */ goog.module('Blockly.Events.ViewportChange'); -const UiBase = goog.require('Blockly.Events.UiBase'); const eventUtils = goog.require('Blockly.Events.utils'); const object = goog.require('Blockly.utils.object'); const registry = goog.require('Blockly.registry'); +const {UiBase} = goog.require('Blockly.Events.UiBase'); /** @@ -102,4 +102,4 @@ ViewportChange.prototype.fromJson = function(json) { registry.register(registry.Type.EVENT, eventUtils.VIEWPORT_CHANGE, ViewportChange); -exports = ViewportChange; +exports.ViewportChange = ViewportChange; diff --git a/core/events/utils.js b/core/events/utils.js index f4078206a..abf2d423c 100644 --- a/core/events/utils.js +++ b/core/events/utils.js @@ -19,20 +19,20 @@ goog.module('Blockly.Events.utils'); /* eslint-disable-next-line no-unused-vars */ const Abstract = goog.requireType('Blockly.Events.Abstract'); -/* eslint-disable-next-line no-unused-vars */ -const BlockMove = goog.requireType('Blockly.Events.BlockMove'); -/* eslint-disable-next-line no-unused-vars */ -const BlockCreate = goog.requireType('Blockly.Events.BlockMove'); -/* eslint-disable-next-line no-unused-vars */ -const CommentCreate = goog.requireType('Blockly.Events.CommentCreate'); -/* eslint-disable-next-line no-unused-vars */ -const CommentMove = goog.requireType('Blockly.Events.CommentMove'); -/* eslint-disable-next-line no-unused-vars */ -const Workspace = goog.requireType('Blockly.Workspace'); const idGenerator = goog.require('Blockly.utils.idGenerator'); const registry = goog.require('Blockly.registry'); /* 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'); +/* eslint-disable-next-line no-unused-vars */ const {Block} = goog.requireType('Blockly.Block'); +/* eslint-disable-next-line no-unused-vars */ +const {CommentCreate} = goog.requireType('Blockly.Events.CommentCreate'); +/* eslint-disable-next-line no-unused-vars */ +const {CommentMove} = goog.requireType('Blockly.Events.CommentMove'); +/* eslint-disable-next-line no-unused-vars */ +const {Workspace} = goog.requireType('Blockly.Workspace'); /** @@ -337,7 +337,7 @@ const fireNow = function() { if (!event.workspaceId) { continue; } - const Workspace = goog.module.get('Blockly.Workspace'); + const {Workspace} = goog.module.get('Blockly.Workspace'); const eventWorkspace = Workspace.getById(event.workspaceId); if (eventWorkspace) { eventWorkspace.fireChangeListener(event); @@ -549,7 +549,7 @@ const disableOrphans = function(event) { if (!event.workspaceId) { return; } - const Workspace = goog.module.get('Blockly.Workspace'); + const {Workspace} = goog.module.get('Blockly.Workspace'); const eventWorkspace = Workspace.getById(event.workspaceId); let block = eventWorkspace.getBlockById(event.blockId); if (block) { diff --git a/core/events/workspace_events.js b/core/events/workspace_events.js index 7828cb8e6..726a114c0 100644 --- a/core/events/workspace_events.js +++ b/core/events/workspace_events.js @@ -16,11 +16,11 @@ goog.module('Blockly.Events.FinishedLoading'); const Abstract = goog.require('Blockly.Events.Abstract'); -/* eslint-disable-next-line no-unused-vars */ -const Workspace = goog.requireType('Blockly.Workspace'); const eventUtils = goog.require('Blockly.Events.utils'); const object = goog.require('Blockly.utils.object'); const registry = goog.require('Blockly.registry'); +/* eslint-disable-next-line no-unused-vars */ +const {Workspace} = goog.requireType('Blockly.Workspace'); /** @@ -96,4 +96,4 @@ FinishedLoading.prototype.fromJson = function(json) { registry.register( registry.Type.EVENT, eventUtils.FINISHED_LOADING, FinishedLoading); -exports = FinishedLoading; +exports.FinishedLoading = FinishedLoading; diff --git a/core/extensions.js b/core/extensions.js index 1174c069c..ce86a9ea5 100644 --- a/core/extensions.js +++ b/core/extensions.js @@ -104,7 +104,7 @@ const registerMutator = function(name, mixinObj, opt_helperFn, opt_blockList) { // Sanity checks passed. register(name, function() { if (hasMutatorDialog) { - const Mutator = goog.module.get('Blockly.Mutator'); + const {Mutator} = goog.module.get('Blockly.Mutator'); if (!Mutator) { throw Error(errorPrefix + 'Missing require for Blockly.Mutator'); } diff --git a/core/field.js b/core/field.js index 10a8ae97a..097396c6e 100644 --- a/core/field.js +++ b/core/field.js @@ -19,43 +19,43 @@ */ goog.module('Blockly.Field'); -/* eslint-disable-next-line no-unused-vars */ -const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); -/* eslint-disable-next-line no-unused-vars */ -const Coordinate = goog.requireType('Blockly.utils.Coordinate'); -const DropDownDiv = goog.require('Blockly.DropDownDiv'); -/* eslint-disable-next-line no-unused-vars */ -const IASTNodeLocationSvg = goog.require('Blockly.IASTNodeLocationSvg'); -/* eslint-disable-next-line no-unused-vars */ -const IASTNodeLocationWithBlock = goog.require('Blockly.IASTNodeLocationWithBlock'); -/* eslint-disable-next-line no-unused-vars */ -const IKeyboardAccessible = goog.require('Blockly.IKeyboardAccessible'); -/* eslint-disable-next-line no-unused-vars */ -const Input = goog.requireType('Blockly.Input'); -/* eslint-disable-next-line no-unused-vars */ -const IRegistrable = goog.require('Blockly.IRegistrable'); -const MarkerManager = goog.require('Blockly.MarkerManager'); -const Rect = goog.require('Blockly.utils.Rect'); -/* eslint-disable-next-line no-unused-vars */ -const ShortcutRegistry = goog.requireType('Blockly.ShortcutRegistry'); -const Size = goog.require('Blockly.utils.Size'); -const Svg = goog.require('Blockly.utils.Svg'); const Tooltip = goog.require('Blockly.Tooltip'); const WidgetDiv = goog.require('Blockly.WidgetDiv'); -/* eslint-disable-next-line no-unused-vars */ -const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); const Xml = goog.require('Blockly.Xml'); +const browserEvents = goog.require('Blockly.browserEvents'); const dom = goog.require('Blockly.utils.dom'); const eventUtils = goog.require('Blockly.Events.utils'); -const browserEvents = goog.require('Blockly.browserEvents'); 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 {BlockSvg} = goog.requireType('Blockly.BlockSvg'); +/* 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 {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider'); +/* eslint-disable-next-line no-unused-vars */ +const {Coordinate} = goog.requireType('Blockly.utils.Coordinate'); +const {DropDownDiv} = goog.require('Blockly.DropDownDiv'); +/* eslint-disable-next-line no-unused-vars */ +const {IASTNodeLocationSvg} = goog.require('Blockly.IASTNodeLocationSvg'); +/* eslint-disable-next-line no-unused-vars */ +const {IASTNodeLocationWithBlock} = goog.require('Blockly.IASTNodeLocationWithBlock'); +/* eslint-disable-next-line no-unused-vars */ +const {IKeyboardAccessible} = goog.require('Blockly.IKeyboardAccessible'); +/* eslint-disable-next-line no-unused-vars */ +const {IRegistrable} = goog.require('Blockly.IRegistrable'); +/* eslint-disable-next-line no-unused-vars */ +const {Input} = goog.requireType('Blockly.Input'); +const {MarkerManager} = goog.require('Blockly.MarkerManager'); +const {Rect} = goog.require('Blockly.utils.Rect'); +/* eslint-disable-next-line no-unused-vars */ +const {ShortcutRegistry} = goog.requireType('Blockly.ShortcutRegistry'); +const {Size} = goog.require('Blockly.utils.Size'); +const {Svg} = goog.require('Blockly.utils.Svg'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.BlockChange'); /** @suppress {extraRequire} */ @@ -1213,4 +1213,4 @@ Field.prototype.updateMarkers_ = function() { } }; -exports = Field; +exports.Field = Field; diff --git a/core/field_angle.js b/core/field_angle.js index 8535dce2e..4ddeb1d84 100644 --- a/core/field_angle.js +++ b/core/field_angle.js @@ -16,10 +16,6 @@ goog.module('Blockly.FieldAngle'); const Css = goog.require('Blockly.Css'); -const DropDownDiv = goog.require('Blockly.DropDownDiv'); -const FieldTextInput = goog.require('Blockly.FieldTextInput'); -const KeyCodes = goog.require('Blockly.utils.KeyCodes'); -const Svg = goog.require('Blockly.utils.Svg'); const WidgetDiv = goog.require('Blockly.WidgetDiv'); const browserEvents = goog.require('Blockly.browserEvents'); const dom = goog.require('Blockly.utils.dom'); @@ -27,6 +23,10 @@ const fieldRegistry = goog.require('Blockly.fieldRegistry'); const math = goog.require('Blockly.utils.math'); const object = goog.require('Blockly.utils.object'); const userAgent = goog.require('Blockly.utils.userAgent'); +const {DropDownDiv} = goog.require('Blockly.DropDownDiv'); +const {FieldTextInput} = goog.require('Blockly.FieldTextInput'); +const {KeyCodes} = goog.require('Blockly.utils.KeyCodes'); +const {Svg} = goog.require('Blockly.utils.Svg'); /** @@ -568,4 +568,4 @@ Css.register(` fieldRegistry.register('field_angle', FieldAngle); -exports = FieldAngle; +exports.FieldAngle = FieldAngle; diff --git a/core/field_checkbox.js b/core/field_checkbox.js index ac445f923..ddbe38711 100644 --- a/core/field_checkbox.js +++ b/core/field_checkbox.js @@ -15,10 +15,10 @@ */ goog.module('Blockly.FieldCheckbox'); -const Field = goog.require('Blockly.Field'); const dom = goog.require('Blockly.utils.dom'); const fieldRegistry = goog.require('Blockly.fieldRegistry'); const object = goog.require('Blockly.utils.object'); +const {Field} = goog.require('Blockly.Field'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.BlockChange'); @@ -240,4 +240,4 @@ FieldCheckbox.prototype.convertValueToBool_ = function(value) { fieldRegistry.register('field_checkbox', FieldCheckbox); -exports = FieldCheckbox; +exports.FieldCheckbox = FieldCheckbox; diff --git a/core/field_colour.js b/core/field_colour.js index db94406cb..2ebba3e88 100644 --- a/core/field_colour.js +++ b/core/field_colour.js @@ -16,10 +16,6 @@ goog.module('Blockly.FieldColour'); const Css = goog.require('Blockly.Css'); -const DropDownDiv = goog.require('Blockly.DropDownDiv'); -const Field = goog.require('Blockly.Field'); -const KeyCodes = goog.require('Blockly.utils.KeyCodes'); -const Size = goog.require('Blockly.utils.Size'); const aria = goog.require('Blockly.utils.aria'); const browserEvents = goog.require('Blockly.browserEvents'); const colour = goog.require('Blockly.utils.colour'); @@ -27,6 +23,10 @@ const dom = goog.require('Blockly.utils.dom'); const fieldRegistry = goog.require('Blockly.fieldRegistry'); const idGenerator = goog.require('Blockly.utils.idGenerator'); const object = goog.require('Blockly.utils.object'); +const {DropDownDiv} = goog.require('Blockly.DropDownDiv'); +const {Field} = goog.require('Blockly.Field'); +const {KeyCodes} = goog.require('Blockly.utils.KeyCodes'); +const {Size} = goog.require('Blockly.utils.Size'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.BlockChange'); @@ -640,4 +640,4 @@ Css.register(` fieldRegistry.register('field_colour', FieldColour); -exports = FieldColour; +exports.FieldColour = FieldColour; diff --git a/core/field_dropdown.js b/core/field_dropdown.js index 47eb5ef91..5f9c8491c 100644 --- a/core/field_dropdown.js +++ b/core/field_dropdown.js @@ -19,12 +19,6 @@ */ goog.module('Blockly.FieldDropdown'); -const Coordinate = goog.require('Blockly.utils.Coordinate'); -const DropDownDiv = goog.require('Blockly.DropDownDiv'); -const Field = goog.require('Blockly.Field'); -const Menu = goog.require('Blockly.Menu'); -const MenuItem = goog.require('Blockly.MenuItem'); -const Svg = goog.require('Blockly.utils.Svg'); const aria = goog.require('Blockly.utils.aria'); const dom = goog.require('Blockly.utils.dom'); const fieldRegistry = goog.require('Blockly.fieldRegistry'); @@ -32,6 +26,12 @@ const object = goog.require('Blockly.utils.object'); const userAgent = goog.require('Blockly.utils.userAgent'); const utils = goog.require('Blockly.utils'); const utilsString = goog.require('Blockly.utils.string'); +const {Coordinate} = goog.require('Blockly.utils.Coordinate'); +const {DropDownDiv} = goog.require('Blockly.DropDownDiv'); +const {Field} = goog.require('Blockly.Field'); +const {MenuItem} = goog.require('Blockly.MenuItem'); +const {Menu} = goog.require('Blockly.Menu'); +const {Svg} = goog.require('Blockly.utils.Svg'); /** @@ -773,4 +773,4 @@ const validateOptions = function(options) { fieldRegistry.register('field_dropdown', FieldDropdown); -exports = FieldDropdown; +exports.FieldDropdown = FieldDropdown; diff --git a/core/field_image.js b/core/field_image.js index e5a8d52a4..54c8b50d5 100644 --- a/core/field_image.js +++ b/core/field_image.js @@ -15,13 +15,13 @@ */ goog.module('Blockly.FieldImage'); -const Field = goog.require('Blockly.Field'); -const Size = goog.require('Blockly.utils.Size'); -const Svg = goog.require('Blockly.utils.Svg'); const dom = goog.require('Blockly.utils.dom'); const fieldRegistry = goog.require('Blockly.fieldRegistry'); const object = goog.require('Blockly.utils.object'); const utils = goog.require('Blockly.utils'); +const {Field} = goog.require('Blockly.Field'); +const {Size} = goog.require('Blockly.utils.Size'); +const {Svg} = goog.require('Blockly.utils.Svg'); /** @@ -292,4 +292,4 @@ FieldImage.prototype.getText_ = function() { fieldRegistry.register('field_image', FieldImage); -exports = FieldImage; +exports.FieldImage = FieldImage; diff --git a/core/field_label.js b/core/field_label.js index 81ad877b0..5deff4406 100644 --- a/core/field_label.js +++ b/core/field_label.js @@ -17,11 +17,11 @@ */ goog.module('Blockly.FieldLabel'); -const Field = goog.require('Blockly.Field'); const dom = goog.require('Blockly.utils.dom'); const fieldRegistry = goog.require('Blockly.fieldRegistry'); const object = goog.require('Blockly.utils.object'); const utils = goog.require('Blockly.utils'); +const {Field} = goog.require('Blockly.Field'); /** @@ -135,4 +135,4 @@ FieldLabel.prototype.setClass = function(cssClass) { fieldRegistry.register('field_label', FieldLabel); -exports = FieldLabel; +exports.FieldLabel = FieldLabel; diff --git a/core/field_label_serializable.js b/core/field_label_serializable.js index e70117bac..e02338b93 100644 --- a/core/field_label_serializable.js +++ b/core/field_label_serializable.js @@ -19,10 +19,10 @@ */ goog.module('Blockly.FieldLabelSerializable'); -const FieldLabel = goog.require('Blockly.FieldLabel'); const fieldRegistry = goog.require('Blockly.fieldRegistry'); const object = goog.require('Blockly.utils.object'); const utils = goog.require('Blockly.utils'); +const {FieldLabel} = goog.require('Blockly.FieldLabel'); /** @@ -76,4 +76,4 @@ FieldLabelSerializable.prototype.SERIALIZABLE = true; fieldRegistry.register('field_label_serializable', FieldLabelSerializable); -exports = FieldLabelSerializable; +exports.FieldLabelSerializable = FieldLabelSerializable; diff --git a/core/field_multilineinput.js b/core/field_multilineinput.js index 8d700ee91..14c9f3c63 100644 --- a/core/field_multilineinput.js +++ b/core/field_multilineinput.js @@ -16,10 +16,6 @@ goog.module('Blockly.FieldMultilineInput'); const Css = goog.require('Blockly.Css'); -const Field = goog.require('Blockly.Field'); -const FieldTextInput = goog.require('Blockly.FieldTextInput'); -const KeyCodes = goog.require('Blockly.utils.KeyCodes'); -const Svg = goog.require('Blockly.utils.Svg'); const WidgetDiv = goog.require('Blockly.WidgetDiv'); const aria = goog.require('Blockly.utils.aria'); const dom = goog.require('Blockly.utils.dom'); @@ -27,6 +23,10 @@ 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'); +const {FieldTextInput} = goog.require('Blockly.FieldTextInput'); +const {Field} = goog.require('Blockly.Field'); +const {KeyCodes} = goog.require('Blockly.utils.KeyCodes'); +const {Svg} = goog.require('Blockly.utils.Svg'); /** @@ -446,4 +446,4 @@ Css.register(` fieldRegistry.register('field_multilinetext', FieldMultilineInput); -exports = FieldMultilineInput; +exports.FieldMultilineInput = FieldMultilineInput; diff --git a/core/field_number.js b/core/field_number.js index 2f5b08126..afa9ee89b 100644 --- a/core/field_number.js +++ b/core/field_number.js @@ -15,10 +15,10 @@ */ goog.module('Blockly.FieldNumber'); -const FieldTextInput = goog.require('Blockly.FieldTextInput'); const aria = goog.require('Blockly.utils.aria'); const fieldRegistry = goog.require('Blockly.fieldRegistry'); const object = goog.require('Blockly.utils.object'); +const {FieldTextInput} = goog.require('Blockly.FieldTextInput'); /** @@ -318,4 +318,4 @@ FieldNumber.prototype.widgetCreate_ = function() { fieldRegistry.register('field_number', FieldNumber); -exports = FieldNumber; +exports.FieldNumber = FieldNumber; diff --git a/core/field_registry.js b/core/field_registry.js index 7fe79d3c0..89cfcab76 100644 --- a/core/field_registry.js +++ b/core/field_registry.js @@ -19,11 +19,11 @@ */ goog.module('Blockly.fieldRegistry'); -/* eslint-disable-next-line no-unused-vars */ -const Field = goog.requireType('Blockly.Field'); -/* eslint-disable-next-line no-unused-vars */ -const IRegistrableField = goog.requireType('Blockly.IRegistrableField'); const registry = goog.require('Blockly.registry'); +/* eslint-disable-next-line no-unused-vars */ +const {Field} = goog.requireType('Blockly.Field'); +/* eslint-disable-next-line no-unused-vars */ +const {IRegistrableField} = goog.requireType('Blockly.IRegistrableField'); /** diff --git a/core/field_textinput.js b/core/field_textinput.js index e4e88f53e..1b9a067da 100644 --- a/core/field_textinput.js +++ b/core/field_textinput.js @@ -15,14 +15,8 @@ */ goog.module('Blockly.FieldTextInput'); -const Coordinate = goog.require('Blockly.utils.Coordinate'); -const DropDownDiv = goog.require('Blockly.DropDownDiv'); -const Field = goog.require('Blockly.Field'); -const KeyCodes = goog.require('Blockly.utils.KeyCodes'); const Msg = goog.require('Blockly.Msg'); const WidgetDiv = goog.require('Blockly.WidgetDiv'); -/* eslint-disable-next-line no-unused-vars */ -const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); const aria = goog.require('Blockly.utils.aria'); const browserEvents = goog.require('Blockly.browserEvents'); const dialog = goog.require('Blockly.dialog'); @@ -34,6 +28,12 @@ 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'); +const {Coordinate} = goog.require('Blockly.utils.Coordinate'); +const {DropDownDiv} = goog.require('Blockly.DropDownDiv'); +const {Field} = goog.require('Blockly.Field'); +const {KeyCodes} = goog.require('Blockly.utils.KeyCodes'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.BlockChange'); @@ -581,4 +581,4 @@ FieldTextInput.prototype.getValueFromEditorText_ = function(text) { fieldRegistry.register('field_input', FieldTextInput); -exports = FieldTextInput; +exports.FieldTextInput = FieldTextInput; diff --git a/core/field_variable.js b/core/field_variable.js index 5d14aade8..4fc76d429 100644 --- a/core/field_variable.js +++ b/core/field_variable.js @@ -15,14 +15,7 @@ */ goog.module('Blockly.FieldVariable'); -const FieldDropdown = goog.require('Blockly.FieldDropdown'); -/* eslint-disable-next-line no-unused-vars */ -const Menu = goog.requireType('Blockly.Menu'); -/* eslint-disable-next-line no-unused-vars */ -const MenuItem = goog.requireType('Blockly.MenuItem'); const Msg = goog.require('Blockly.Msg'); -const Size = goog.require('Blockly.utils.Size'); -const VariableModel = goog.require('Blockly.VariableModel'); const Variables = goog.require('Blockly.Variables'); const Xml = goog.require('Blockly.Xml'); const fieldRegistry = goog.require('Blockly.fieldRegistry'); @@ -31,6 +24,13 @@ 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'); +const {FieldDropdown} = goog.require('Blockly.FieldDropdown'); +/* eslint-disable-next-line no-unused-vars */ +const {MenuItem} = goog.requireType('Blockly.MenuItem'); +/* eslint-disable-next-line no-unused-vars */ +const {Menu} = goog.requireType('Blockly.Menu'); +const {Size} = goog.require('Blockly.utils.Size'); +const {VariableModel} = goog.require('Blockly.VariableModel'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.BlockChange'); @@ -517,4 +517,4 @@ FieldVariable.prototype.referencesVariables = function() { fieldRegistry.register('field_variable', FieldVariable); -exports = FieldVariable; +exports.FieldVariable = FieldVariable; diff --git a/core/flyout_base.js b/core/flyout_base.js index 5e9d8c63f..eee4bfc73 100644 --- a/core/flyout_base.js +++ b/core/flyout_base.js @@ -15,21 +15,8 @@ */ goog.module('Blockly.Flyout'); -const ComponentManager = goog.require('Blockly.ComponentManager'); -const Coordinate = goog.require('Blockly.utils.Coordinate'); -const DeleteArea = goog.require('Blockly.DeleteArea'); -/* eslint-disable-next-line no-unused-vars */ -const FlyoutButton = goog.requireType('Blockly.FlyoutButton'); -const FlyoutMetricsManager = goog.require('Blockly.FlyoutMetricsManager'); -/* eslint-disable-next-line no-unused-vars */ -const IFlyout = goog.require('Blockly.IFlyout'); -/* eslint-disable-next-line no-unused-vars */ -const Options = goog.requireType('Blockly.Options'); -const ScrollbarPair = goog.require('Blockly.ScrollbarPair'); -const Svg = goog.require('Blockly.utils.Svg'); const Tooltip = goog.require('Blockly.Tooltip'); const Variables = goog.require('Blockly.Variables'); -const WorkspaceSvg = goog.require('Blockly.WorkspaceSvg'); const Xml = goog.require('Blockly.Xml'); const blocks = goog.require('Blockly.serialization.blocks'); const browserEvents = goog.require('Blockly.browserEvents'); @@ -40,11 +27,22 @@ 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'); +/* eslint-disable-next-line no-unused-vars */ +const {Block} = goog.requireType('Blockly.Block'); +const {ComponentManager} = goog.require('Blockly.ComponentManager'); +const {Coordinate} = goog.require('Blockly.utils.Coordinate'); +const {DeleteArea} = goog.require('Blockly.DeleteArea'); +/* eslint-disable-next-line no-unused-vars */ +const {FlyoutButton} = goog.requireType('Blockly.FlyoutButton'); +const {FlyoutMetricsManager} = goog.require('Blockly.FlyoutMetricsManager'); +/* eslint-disable-next-line no-unused-vars */ +const {IFlyout} = goog.require('Blockly.IFlyout'); +/* eslint-disable-next-line no-unused-vars */ +const {Options} = goog.requireType('Blockly.Options'); +const {ScrollbarPair} = goog.require('Blockly.ScrollbarPair'); +const {Svg} = goog.require('Blockly.utils.Svg'); +const {WorkspaceSvg} = goog.require('Blockly.WorkspaceSvg'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.BlockCreate'); /** @suppress {extraRequire} */ @@ -53,6 +51,8 @@ goog.require('Blockly.Events.VarCreate'); goog.require('Blockly.Gesture'); /** @suppress {extraRequire} */ goog.require('Blockly.Touch'); +/** @suppress {extraRequire} */ +goog.require('Blockly.blockRendering'); /** @@ -663,7 +663,7 @@ Flyout.prototype.getDynamicCategoryContents_ = function(categoryName) { * @private */ Flyout.prototype.createButton_ = function(btnInfo, isLabel) { - const FlyoutButton = goog.module.get('Blockly.FlyoutButton'); + const {FlyoutButton} = goog.module.get('Blockly.FlyoutButton'); if (!FlyoutButton) { throw Error('Missing require for Blockly.FlyoutButton'); } @@ -1193,4 +1193,4 @@ Flyout.prototype.getX; */ Flyout.prototype.getY; -exports = Flyout; +exports.Flyout = Flyout; diff --git a/core/flyout_button.js b/core/flyout_button.js index 18003d4be..da2c7bae2 100644 --- a/core/flyout_button.js +++ b/core/flyout_button.js @@ -15,17 +15,17 @@ */ goog.module('Blockly.FlyoutButton'); -const Coordinate = goog.require('Blockly.utils.Coordinate'); const Css = goog.require('Blockly.Css'); -const Svg = goog.require('Blockly.utils.Svg'); -/* eslint-disable-next-line no-unused-vars */ -const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); const browserEvents = goog.require('Blockly.browserEvents'); const dom = goog.require('Blockly.utils.dom'); const style = goog.require('Blockly.utils.style'); /* eslint-disable-next-line no-unused-vars */ const toolbox = goog.requireType('Blockly.utils.toolbox'); const utils = goog.require('Blockly.utils'); +const {Coordinate} = goog.require('Blockly.utils.Coordinate'); +const {Svg} = goog.require('Blockly.utils.Svg'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg'); /** @@ -336,4 +336,4 @@ Css.register(` } `); -exports = FlyoutButton; +exports.FlyoutButton = FlyoutButton; diff --git a/core/flyout_horizontal.js b/core/flyout_horizontal.js index 1af1283f8..1ff150c4f 100644 --- a/core/flyout_horizontal.js +++ b/core/flyout_horizontal.js @@ -15,19 +15,19 @@ */ goog.module('Blockly.HorizontalFlyout'); -/* eslint-disable-next-line no-unused-vars */ -const Coordinate = goog.requireType('Blockly.utils.Coordinate'); -const DropDownDiv = goog.require('Blockly.DropDownDiv'); -const Flyout = goog.require('Blockly.Flyout'); -/* eslint-disable-next-line no-unused-vars */ -const Options = goog.requireType('Blockly.Options'); -const Rect = goog.require('Blockly.utils.Rect'); -const Scrollbar = goog.require('Blockly.Scrollbar'); const WidgetDiv = goog.require('Blockly.WidgetDiv'); const browserEvents = goog.require('Blockly.browserEvents'); const object = goog.require('Blockly.utils.object'); const registry = goog.require('Blockly.registry'); const toolbox = goog.require('Blockly.utils.toolbox'); +/* eslint-disable-next-line no-unused-vars */ +const {Coordinate} = goog.requireType('Blockly.utils.Coordinate'); +const {DropDownDiv} = goog.require('Blockly.DropDownDiv'); +const {Flyout} = goog.require('Blockly.Flyout'); +/* eslint-disable-next-line no-unused-vars */ +const {Options} = goog.requireType('Blockly.Options'); +const {Rect} = goog.require('Blockly.utils.Rect'); +const {Scrollbar} = goog.require('Blockly.Scrollbar'); /** @@ -386,4 +386,4 @@ registry.register( registry.Type.FLYOUTS_HORIZONTAL_TOOLBOX, registry.DEFAULT, HorizontalFlyout); -exports = HorizontalFlyout; +exports.HorizontalFlyout = HorizontalFlyout; diff --git a/core/flyout_metrics_manager.js b/core/flyout_metrics_manager.js index f95d0027c..ddbabd2a6 100644 --- a/core/flyout_metrics_manager.js +++ b/core/flyout_metrics_manager.js @@ -15,12 +15,12 @@ */ goog.module('Blockly.FlyoutMetricsManager'); -/* eslint-disable-next-line no-unused-vars */ -const IFlyout = goog.requireType('Blockly.IFlyout'); -const MetricsManager = goog.require('Blockly.MetricsManager'); -/* eslint-disable-next-line no-unused-vars */ -const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); const object = goog.require('Blockly.utils.object'); +/* eslint-disable-next-line no-unused-vars */ +const {IFlyout} = goog.requireType('Blockly.IFlyout'); +const {MetricsManager} = goog.require('Blockly.MetricsManager'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg'); /** @@ -103,4 +103,4 @@ FlyoutMetricsManager.prototype.getScrollMetrics = function( }; }; -exports = FlyoutMetricsManager; +exports.FlyoutMetricsManager = FlyoutMetricsManager; diff --git a/core/flyout_vertical.js b/core/flyout_vertical.js index fab6c35ce..b6e985f99 100644 --- a/core/flyout_vertical.js +++ b/core/flyout_vertical.js @@ -15,19 +15,19 @@ */ goog.module('Blockly.VerticalFlyout'); -/* eslint-disable-next-line no-unused-vars */ -const Coordinate = goog.requireType('Blockly.utils.Coordinate'); -const DropDownDiv = goog.require('Blockly.DropDownDiv'); -const Flyout = goog.require('Blockly.Flyout'); -/* eslint-disable-next-line no-unused-vars */ -const Options = goog.requireType('Blockly.Options'); -const Rect = goog.require('Blockly.utils.Rect'); -const Scrollbar = goog.require('Blockly.Scrollbar'); const WidgetDiv = goog.require('Blockly.WidgetDiv'); const browserEvents = goog.require('Blockly.browserEvents'); const object = goog.require('Blockly.utils.object'); const registry = goog.require('Blockly.registry'); const toolbox = goog.require('Blockly.utils.toolbox'); +/* eslint-disable-next-line no-unused-vars */ +const {Coordinate} = goog.requireType('Blockly.utils.Coordinate'); +const {DropDownDiv} = goog.require('Blockly.DropDownDiv'); +const {Flyout} = goog.require('Blockly.Flyout'); +/* eslint-disable-next-line no-unused-vars */ +const {Options} = goog.requireType('Blockly.Options'); +const {Rect} = goog.require('Blockly.utils.Rect'); +const {Scrollbar} = goog.require('Blockly.Scrollbar'); /** @suppress {extraRequire} */ goog.require('Blockly.Block'); /** @suppress {extraRequire} */ @@ -386,4 +386,4 @@ VerticalFlyout.prototype.reflowInternal_ = function() { registry.register( registry.Type.FLYOUTS_VERTICAL_TOOLBOX, registry.DEFAULT, VerticalFlyout); -exports = VerticalFlyout; +exports.VerticalFlyout = VerticalFlyout; diff --git a/core/generator.js b/core/generator.js index e1a2f9054..3c163b5be 100644 --- a/core/generator.js +++ b/core/generator.js @@ -17,15 +17,15 @@ */ goog.module('Blockly.Generator'); -/* eslint-disable-next-line no-unused-vars */ -const Names = goog.requireType('Blockly.Names'); -/* eslint-disable-next-line no-unused-vars */ -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'); +/* eslint-disable-next-line no-unused-vars */ +const {Names} = goog.requireType('Blockly.Names'); +/* eslint-disable-next-line no-unused-vars */ +const {Workspace} = goog.requireType('Blockly.Workspace'); /** @@ -549,4 +549,4 @@ Generator.prototype.scrubNakedValue = function(line) { return line; }; -exports = Generator; +exports.Generator = Generator; diff --git a/core/gesture.js b/core/gesture.js index ec1a7df9e..faa178076 100644 --- a/core/gesture.js +++ b/core/gesture.js @@ -17,22 +17,8 @@ */ goog.module('Blockly.Gesture'); -const BubbleDragger = goog.require('Blockly.BubbleDragger'); -const Coordinate = goog.require('Blockly.utils.Coordinate'); -/* eslint-disable-next-line no-unused-vars */ -const Field = goog.requireType('Blockly.Field'); -/* eslint-disable-next-line no-unused-vars */ -const IBlockDragger = goog.requireType('Blockly.IBlockDragger'); -/* eslint-disable-next-line no-unused-vars */ -const IBubble = goog.requireType('Blockly.IBubble'); -/* eslint-disable-next-line no-unused-vars */ -const IFlyout = goog.requireType('Blockly.IFlyout'); const Tooltip = goog.require('Blockly.Tooltip'); const Touch = goog.require('Blockly.Touch'); -const Workspace = goog.require('Blockly.Workspace'); -/* eslint-disable-next-line no-unused-vars */ -const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); -const WorkspaceDragger = goog.require('Blockly.WorkspaceDragger'); const blockAnimations = goog.require('Blockly.blockAnimations'); const browserEvents = goog.require('Blockly.browserEvents'); const common = goog.require('Blockly.common'); @@ -41,6 +27,20 @@ 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'); +const {BubbleDragger} = goog.require('Blockly.BubbleDragger'); +const {Coordinate} = goog.require('Blockly.utils.Coordinate'); +/* eslint-disable-next-line no-unused-vars */ +const {Field} = goog.requireType('Blockly.Field'); +/* eslint-disable-next-line no-unused-vars */ +const {IBlockDragger} = goog.requireType('Blockly.IBlockDragger'); +/* eslint-disable-next-line no-unused-vars */ +const {IBubble} = goog.requireType('Blockly.IBubble'); +/* eslint-disable-next-line no-unused-vars */ +const {IFlyout} = goog.requireType('Blockly.IFlyout'); +const {WorkspaceDragger} = goog.require('Blockly.WorkspaceDragger'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg'); +const {Workspace} = goog.require('Blockly.Workspace'); /** @suppress {extraRequire} */ goog.require('Blockly.BlockDragger'); /** @suppress {extraRequire} */ @@ -1007,4 +1007,4 @@ Gesture.inProgress = function() { return false; }; -exports = Gesture; +exports.Gesture = Gesture; diff --git a/core/grid.js b/core/grid.js index 0c90268df..a16d3f083 100644 --- a/core/grid.js +++ b/core/grid.js @@ -17,9 +17,9 @@ */ goog.module('Blockly.Grid'); -const Svg = goog.require('Blockly.utils.Svg'); const dom = goog.require('Blockly.utils.dom'); const userAgent = goog.require('Blockly.utils.userAgent'); +const {Svg} = goog.require('Blockly.utils.Svg'); /** @@ -220,4 +220,4 @@ Grid.createDom = function(rnd, gridOptions, defs) { return gridPattern; }; -exports = Grid; +exports.Grid = Grid; diff --git a/core/icon.js b/core/icon.js index 936bfa2af..55f650d9e 100644 --- a/core/icon.js +++ b/core/icon.js @@ -15,16 +15,16 @@ */ goog.module('Blockly.Icon'); -/* eslint-disable-next-line no-unused-vars */ -const Bubble = goog.requireType('Blockly.Bubble'); -const Coordinate = goog.require('Blockly.utils.Coordinate'); -const Size = goog.require('Blockly.utils.Size'); -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'); +/* eslint-disable-next-line no-unused-vars */ +const {Bubble} = goog.requireType('Blockly.Bubble'); +const {Coordinate} = goog.require('Blockly.utils.Coordinate'); +const {Size} = goog.require('Blockly.utils.Size'); +const {Svg} = goog.require('Blockly.utils.Svg'); /** @@ -213,4 +213,4 @@ Icon.prototype.drawIcon_; */ Icon.prototype.setVisible; -exports = Icon; +exports.Icon = Icon; diff --git a/core/inject.js b/core/inject.js index 661f577e5..e5ce6ff1a 100644 --- a/core/inject.js +++ b/core/inject.js @@ -15,21 +15,10 @@ */ goog.module('Blockly.inject'); -/* eslint-disable-next-line no-unused-vars */ -const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions'); const Css = goog.require('Blockly.Css'); -const DropDownDiv = goog.require('Blockly.DropDownDiv'); -const Grid = goog.require('Blockly.Grid'); const Msg = goog.require('Blockly.Msg'); -const Options = goog.require('Blockly.Options'); -const ScrollbarPair = goog.require('Blockly.ScrollbarPair'); -const Touch = goog.require('Blockly.Touch'); const Tooltip = goog.require('Blockly.Tooltip'); -const ShortcutRegistry = goog.require('Blockly.ShortcutRegistry'); -const Svg = goog.require('Blockly.utils.Svg'); -const Workspace = goog.require('Blockly.Workspace'); -const WorkspaceDragSurfaceSvg = goog.require('Blockly.WorkspaceDragSurfaceSvg'); -const WorkspaceSvg = goog.require('Blockly.WorkspaceSvg'); +const Touch = goog.require('Blockly.Touch'); const WidgetDiv = goog.require('Blockly.WidgetDiv'); const aria = goog.require('Blockly.utils.aria'); const browserEvents = goog.require('Blockly.browserEvents'); @@ -38,6 +27,17 @@ const common = goog.require('Blockly.common'); const dom = goog.require('Blockly.utils.dom'); const userAgent = goog.require('Blockly.utils.userAgent'); const {BlockDragSurfaceSvg} = goog.require('Blockly.BlockDragSurfaceSvg'); +/* eslint-disable-next-line no-unused-vars */ +const {BlocklyOptions} = goog.requireType('Blockly.BlocklyOptions'); +const {DropDownDiv} = goog.require('Blockly.DropDownDiv'); +const {Grid} = goog.require('Blockly.Grid'); +const {Options} = goog.require('Blockly.Options'); +const {ScrollbarPair} = goog.require('Blockly.ScrollbarPair'); +const {ShortcutRegistry} = goog.require('Blockly.ShortcutRegistry'); +const {Svg} = goog.require('Blockly.utils.Svg'); +const {WorkspaceDragSurfaceSvg} = goog.require('Blockly.WorkspaceDragSurfaceSvg'); +const {WorkspaceSvg} = goog.require('Blockly.WorkspaceSvg'); +const {Workspace} = goog.require('Blockly.Workspace'); /** @@ -381,4 +381,4 @@ const loadSounds = function(pathToMedia, workspace) { document, 'touchstart', null, unbindSounds, true)); }; -exports = inject; +exports.inject = inject; diff --git a/core/input.js b/core/input.js index 1c72ea428..8f805d6f7 100644 --- a/core/input.js +++ b/core/input.js @@ -15,19 +15,19 @@ */ goog.module('Blockly.Input'); -/* eslint-disable-next-line no-unused-vars */ -const Connection = goog.requireType('Blockly.Connection'); -/* eslint-disable-next-line no-unused-vars */ -const Field = goog.requireType('Blockly.Field'); -/* eslint-disable-next-line no-unused-vars */ -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 {BlockSvg} = goog.requireType('Blockly.BlockSvg'); /* 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.requireType('Blockly.Connection'); +/* eslint-disable-next-line no-unused-vars */ +const {Field} = goog.requireType('Blockly.Field'); +/* eslint-disable-next-line no-unused-vars */ +const {RenderedConnection} = goog.requireType('Blockly.RenderedConnection'); +const {inputTypes} = goog.require('Blockly.inputTypes'); /** @suppress {extraRequire} */ goog.require('Blockly.FieldLabel'); @@ -312,4 +312,4 @@ Input.prototype.dispose = function() { this.sourceBlock_ = null; }; -exports = Input; +exports.Input = Input; diff --git a/core/input_types.js b/core/input_types.js index 187075ad2..0648bfb78 100644 --- a/core/input_types.js +++ b/core/input_types.js @@ -33,4 +33,4 @@ const inputTypes = { DUMMY: 5 }; -exports = inputTypes; +exports.inputTypes = inputTypes; diff --git a/core/insertion_marker_manager.js b/core/insertion_marker_manager.js index 156d0cfdf..8fbc8c029 100644 --- a/core/insertion_marker_manager.js +++ b/core/insertion_marker_manager.js @@ -15,17 +15,6 @@ */ goog.module('Blockly.InsertionMarkerManager'); -const ComponentManager = goog.require('Blockly.ComponentManager'); -/* eslint-disable-next-line no-unused-vars */ -const Coordinate = goog.requireType('Blockly.utils.Coordinate'); -/* eslint-disable-next-line no-unused-vars */ -const IDeleteArea = goog.requireType('Blockly.IDeleteArea'); -/* eslint-disable-next-line no-unused-vars */ -const IDragTarget = goog.requireType('Blockly.IDragTarget'); -/* eslint-disable-next-line no-unused-vars */ -const RenderedConnection = goog.requireType('Blockly.RenderedConnection'); -/* eslint-disable-next-line no-unused-vars */ -const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); const blockAnimations = goog.require('Blockly.blockAnimations'); const common = goog.require('Blockly.common'); const constants = goog.require('Blockly.constants'); @@ -33,7 +22,18 @@ const eventUtils = goog.require('Blockly.Events.utils'); const internalConstants = goog.require('Blockly.internalConstants'); /* eslint-disable-next-line no-unused-vars */ const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); +const {ComponentManager} = goog.require('Blockly.ComponentManager'); const {ConnectionType} = goog.require('Blockly.ConnectionType'); +/* eslint-disable-next-line no-unused-vars */ +const {Coordinate} = goog.requireType('Blockly.utils.Coordinate'); +/* eslint-disable-next-line no-unused-vars */ +const {IDeleteArea} = goog.requireType('Blockly.IDeleteArea'); +/* eslint-disable-next-line no-unused-vars */ +const {IDragTarget} = goog.requireType('Blockly.IDragTarget'); +/* eslint-disable-next-line no-unused-vars */ +const {RenderedConnection} = goog.requireType('Blockly.RenderedConnection'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg'); /** @@ -757,4 +757,4 @@ InsertionMarkerManager.prototype.getInsertionMarkers = function() { return result; }; -exports = InsertionMarkerManager; +exports.InsertionMarkerManager = InsertionMarkerManager; diff --git a/core/interfaces/i_ast_node_location.js b/core/interfaces/i_ast_node_location.js index 3825ea810..eac11e4a9 100644 --- a/core/interfaces/i_ast_node_location.js +++ b/core/interfaces/i_ast_node_location.js @@ -23,4 +23,4 @@ goog.module('Blockly.IASTNodeLocation'); */ const IASTNodeLocation = function() {}; -exports = IASTNodeLocation; +exports.IASTNodeLocation = IASTNodeLocation; diff --git a/core/interfaces/i_ast_node_location_svg.js b/core/interfaces/i_ast_node_location_svg.js index 196a28166..5504ada70 100644 --- a/core/interfaces/i_ast_node_location_svg.js +++ b/core/interfaces/i_ast_node_location_svg.js @@ -17,7 +17,7 @@ goog.module('Blockly.IASTNodeLocationSvg'); /* eslint-disable-next-line no-unused-vars */ -const IASTNodeLocation = goog.require('Blockly.IASTNodeLocation'); +const {IASTNodeLocation} = goog.require('Blockly.IASTNodeLocation'); /** @@ -42,4 +42,4 @@ IASTNodeLocationSvg.prototype.setMarkerSvg; */ IASTNodeLocationSvg.prototype.setCursorSvg; -exports = IASTNodeLocationSvg; +exports.IASTNodeLocationSvg = IASTNodeLocationSvg; diff --git a/core/interfaces/i_ast_node_location_with_block.js b/core/interfaces/i_ast_node_location_with_block.js index 499832cdc..ce836c671 100644 --- a/core/interfaces/i_ast_node_location_with_block.js +++ b/core/interfaces/i_ast_node_location_with_block.js @@ -18,10 +18,10 @@ */ goog.module('Blockly.IASTNodeLocationWithBlock'); -/* eslint-disable-next-line no-unused-vars */ -const IASTNodeLocation = goog.require('Blockly.IASTNodeLocation'); /* eslint-disable-next-line no-unused-vars */ const {Block} = goog.requireType('Blockly.Block'); +/* eslint-disable-next-line no-unused-vars */ +const {IASTNodeLocation} = goog.require('Blockly.IASTNodeLocation'); /** @@ -38,4 +38,4 @@ const IASTNodeLocationWithBlock = function() {}; */ IASTNodeLocationWithBlock.prototype.getSourceBlock; -exports = IASTNodeLocationWithBlock; +exports.IASTNodeLocationWithBlock = IASTNodeLocationWithBlock; diff --git a/core/interfaces/i_autohideable.js b/core/interfaces/i_autohideable.js index c93cb578d..39ddf5a56 100644 --- a/core/interfaces/i_autohideable.js +++ b/core/interfaces/i_autohideable.js @@ -19,7 +19,7 @@ goog.module('Blockly.IAutoHideable'); /* eslint-disable-next-line no-unused-vars */ -const IComponent = goog.require('Blockly.IComponent'); +const {IComponent} = goog.require('Blockly.IComponent'); /** @@ -37,4 +37,4 @@ const IAutoHideable = function() {}; */ IAutoHideable.prototype.autoHide; -exports = IAutoHideable; +exports.IAutoHideable = IAutoHideable; diff --git a/core/interfaces/i_block_dragger.js b/core/interfaces/i_block_dragger.js index 47f2ea3f8..e2108712e 100644 --- a/core/interfaces/i_block_dragger.js +++ b/core/interfaces/i_block_dragger.js @@ -16,10 +16,10 @@ */ goog.module('Blockly.IBlockDragger'); -/* 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'); +/* eslint-disable-next-line no-unused-vars */ +const {Coordinate} = goog.requireType('Blockly.utils.Coordinate'); /** @@ -63,4 +63,4 @@ IBlockDragger.prototype.endDrag; */ IBlockDragger.prototype.getInsertionMarkers; -exports = IBlockDragger; +exports.IBlockDragger = IBlockDragger; diff --git a/core/interfaces/i_bounded_element.js b/core/interfaces/i_bounded_element.js index 09f7f354e..6b100d677 100644 --- a/core/interfaces/i_bounded_element.js +++ b/core/interfaces/i_bounded_element.js @@ -17,7 +17,7 @@ goog.module('Blockly.IBoundedElement'); /* eslint-disable-next-line no-unused-vars */ -const Rect = goog.requireType('Blockly.utils.Rect'); +const {Rect} = goog.requireType('Blockly.utils.Rect'); /** @@ -42,4 +42,4 @@ IBoundedElement.prototype.getBoundingRectangle; */ IBoundedElement.prototype.moveBy; -exports = IBoundedElement; +exports.IBoundedElement = IBoundedElement; diff --git a/core/interfaces/i_bubble.js b/core/interfaces/i_bubble.js index b3f10f4f7..5cc89b6f4 100644 --- a/core/interfaces/i_bubble.js +++ b/core/interfaces/i_bubble.js @@ -16,14 +16,14 @@ */ goog.module('Blockly.IBubble'); -/* eslint-disable-next-line no-unused-vars */ -const Coordinate = goog.requireType('Blockly.utils.Coordinate'); -/* eslint-disable-next-line no-unused-vars */ -const IContextMenu = goog.require('Blockly.IContextMenu'); -/* eslint-disable-next-line no-unused-vars */ -const IDraggable = goog.require('Blockly.IDraggable'); /* 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.require('Blockly.IContextMenu'); +/* eslint-disable-next-line no-unused-vars */ +const {IDraggable} = goog.require('Blockly.IDraggable'); /** @@ -92,4 +92,4 @@ IBubble.prototype.setDeleteStyle; */ IBubble.prototype.dispose; -exports = IBubble; +exports.IBubble = IBubble; diff --git a/core/interfaces/i_collapsible_toolbox_item.js b/core/interfaces/i_collapsible_toolbox_item.js index f73ab5ced..4326867e0 100644 --- a/core/interfaces/i_collapsible_toolbox_item.js +++ b/core/interfaces/i_collapsible_toolbox_item.js @@ -17,9 +17,9 @@ goog.module('Blockly.ICollapsibleToolboxItem'); /* eslint-disable-next-line no-unused-vars */ -const ISelectableToolboxItem = goog.require('Blockly.ISelectableToolboxItem'); +const {ISelectableToolboxItem} = goog.require('Blockly.ISelectableToolboxItem'); /* eslint-disable-next-line no-unused-vars */ -const IToolboxItem = goog.requireType('Blockly.IToolboxItem'); +const {IToolboxItem} = goog.requireType('Blockly.IToolboxItem'); /** @@ -50,4 +50,4 @@ ICollapsibleToolboxItem.prototype.isExpanded; */ ICollapsibleToolboxItem.prototype.toggleExpanded; -exports = ICollapsibleToolboxItem; +exports.ICollapsibleToolboxItem = ICollapsibleToolboxItem; diff --git a/core/interfaces/i_component.js b/core/interfaces/i_component.js index 5bb814309..3b191ad6f 100644 --- a/core/interfaces/i_component.js +++ b/core/interfaces/i_component.js @@ -34,4 +34,4 @@ const IComponent = function() {}; */ IComponent.id; -exports = IComponent; +exports.IComponent = IComponent; diff --git a/core/interfaces/i_connection_checker.js b/core/interfaces/i_connection_checker.js index b0b8627ee..60d834408 100644 --- a/core/interfaces/i_connection_checker.js +++ b/core/interfaces/i_connection_checker.js @@ -18,9 +18,9 @@ goog.module('Blockly.IConnectionChecker'); /* eslint-disable-next-line no-unused-vars */ -const Connection = goog.requireType('Blockly.Connection'); +const {Connection} = goog.requireType('Blockly.Connection'); /* eslint-disable-next-line no-unused-vars */ -const RenderedConnection = goog.requireType('Blockly.RenderedConnection'); +const {RenderedConnection} = goog.requireType('Blockly.RenderedConnection'); /** @@ -101,4 +101,4 @@ IConnectionChecker.prototype.doTypeChecks; */ IConnectionChecker.prototype.doDragChecks; -exports = IConnectionChecker; +exports.IConnectionChecker = IConnectionChecker; diff --git a/core/interfaces/i_contextmenu.js b/core/interfaces/i_contextmenu.js index 33b5b905d..f6c127870 100644 --- a/core/interfaces/i_contextmenu.js +++ b/core/interfaces/i_contextmenu.js @@ -29,4 +29,4 @@ const IContextMenu = function() {}; */ IContextMenu.prototype.showContextMenu; -exports = IContextMenu; +exports.IContextMenu = IContextMenu; diff --git a/core/interfaces/i_copyable.js b/core/interfaces/i_copyable.js index b22acfc99..6843f1387 100644 --- a/core/interfaces/i_copyable.js +++ b/core/interfaces/i_copyable.js @@ -17,9 +17,9 @@ goog.module('Blockly.ICopyable'); /* eslint-disable-next-line no-unused-vars */ -const ISelectable = goog.require('Blockly.ISelectable'); +const {ISelectable} = goog.require('Blockly.ISelectable'); /* eslint-disable-next-line no-unused-vars */ -const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); +const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg'); /** @@ -46,4 +46,4 @@ ICopyable.prototype.toCopyData; */ ICopyable.CopyData; -exports = ICopyable; +exports.ICopyable = ICopyable; diff --git a/core/interfaces/i_deletable.js b/core/interfaces/i_deletable.js index 98b0168f8..6b9426b71 100644 --- a/core/interfaces/i_deletable.js +++ b/core/interfaces/i_deletable.js @@ -30,4 +30,4 @@ const IDeletable = function() {}; */ IDeletable.prototype.isDeletable; -exports = IDeletable; +exports.IDeletable = IDeletable; diff --git a/core/interfaces/i_delete_area.js b/core/interfaces/i_delete_area.js index b8cb4557d..97783c7b4 100644 --- a/core/interfaces/i_delete_area.js +++ b/core/interfaces/i_delete_area.js @@ -19,9 +19,9 @@ goog.module('Blockly.IDeleteArea'); /* eslint-disable-next-line no-unused-vars */ -const IDraggable = goog.requireType('Blockly.IDraggable'); +const {IDragTarget} = goog.require('Blockly.IDragTarget'); /* eslint-disable-next-line no-unused-vars */ -const IDragTarget = goog.require('Blockly.IDragTarget'); +const {IDraggable} = goog.requireType('Blockly.IDraggable'); /** @@ -47,4 +47,4 @@ const IDeleteArea = function() {}; */ IDeleteArea.prototype.wouldDelete; -exports = IDeleteArea; +exports.IDeleteArea = IDeleteArea; diff --git a/core/interfaces/i_drag_target.js b/core/interfaces/i_drag_target.js index e66aaadfd..15668f297 100644 --- a/core/interfaces/i_drag_target.js +++ b/core/interfaces/i_drag_target.js @@ -19,11 +19,11 @@ goog.module('Blockly.IDragTarget'); /* eslint-disable-next-line no-unused-vars */ -const IComponent = goog.require('Blockly.IComponent'); +const {IComponent} = goog.require('Blockly.IComponent'); /* eslint-disable-next-line no-unused-vars */ -const IDraggable = goog.requireType('Blockly.IDraggable'); +const {IDraggable} = goog.requireType('Blockly.IDraggable'); /* eslint-disable-next-line no-unused-vars */ -const Rect = goog.requireType('Blockly.utils.Rect'); +const {Rect} = goog.requireType('Blockly.utils.Rect'); /** @@ -85,4 +85,4 @@ IDragTarget.prototype.onDrop; */ IDragTarget.prototype.shouldPreventMove; -exports = IDragTarget; +exports.IDragTarget = IDragTarget; diff --git a/core/interfaces/i_draggable.js b/core/interfaces/i_draggable.js index cffffde3f..8bae48460 100644 --- a/core/interfaces/i_draggable.js +++ b/core/interfaces/i_draggable.js @@ -17,7 +17,7 @@ goog.module('Blockly.IDraggable'); /* eslint-disable-next-line no-unused-vars */ -const IDeletable = goog.require('Blockly.IDeletable'); +const {IDeletable} = goog.require('Blockly.IDeletable'); /** @@ -28,4 +28,4 @@ const IDeletable = goog.require('Blockly.IDeletable'); */ const IDraggable = function() {}; -exports = IDraggable; +exports.IDraggable = IDraggable; diff --git a/core/interfaces/i_flyout.js b/core/interfaces/i_flyout.js index d968ecf65..90668780d 100644 --- a/core/interfaces/i_flyout.js +++ b/core/interfaces/i_flyout.js @@ -16,18 +16,18 @@ */ goog.module('Blockly.IFlyout'); -/* eslint-disable-next-line no-unused-vars */ -const Coordinate = goog.requireType('Blockly.utils.Coordinate'); -/* eslint-disable-next-line no-unused-vars */ -const IRegistrable = goog.require('Blockly.IRegistrable'); -/* eslint-disable-next-line no-unused-vars */ -const Svg = goog.requireType('Blockly.utils.Svg'); -/* eslint-disable-next-line no-unused-vars */ -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'); +/* eslint-disable-next-line no-unused-vars */ +const {Coordinate} = goog.requireType('Blockly.utils.Coordinate'); +/* eslint-disable-next-line no-unused-vars */ +const {IRegistrable} = goog.require('Blockly.IRegistrable'); +/* eslint-disable-next-line no-unused-vars */ +const {Svg} = goog.requireType('Blockly.utils.Svg'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg'); /** @@ -198,4 +198,4 @@ IFlyout.prototype.position; */ IFlyout.prototype.isDragTowardWorkspace; -exports = IFlyout; +exports.IFlyout = IFlyout; diff --git a/core/interfaces/i_keyboard_accessible.js b/core/interfaces/i_keyboard_accessible.js index c31541d52..60ccb28fb 100644 --- a/core/interfaces/i_keyboard_accessible.js +++ b/core/interfaces/i_keyboard_accessible.js @@ -17,7 +17,7 @@ goog.module('Blockly.IKeyboardAccessible'); /* eslint-disable-next-line no-unused-vars */ -const ShortcutRegistry = goog.requireType('Blockly.ShortcutRegistry'); +const {ShortcutRegistry} = goog.requireType('Blockly.ShortcutRegistry'); /** @@ -35,4 +35,4 @@ const IKeyboardAccessible = function() {}; */ IKeyboardAccessible.prototype.onShortcut; -exports = IKeyboardAccessible; +exports.IKeyboardAccessible = IKeyboardAccessible; diff --git a/core/interfaces/i_metrics_manager.js b/core/interfaces/i_metrics_manager.js index df99926a3..a281fedf9 100644 --- a/core/interfaces/i_metrics_manager.js +++ b/core/interfaces/i_metrics_manager.js @@ -17,11 +17,11 @@ goog.module('Blockly.IMetricsManager'); /* eslint-disable-next-line no-unused-vars */ -const Metrics = goog.requireType('Blockly.utils.Metrics'); +const {MetricsManager} = goog.requireType('Blockly.MetricsManager'); /* eslint-disable-next-line no-unused-vars */ -const MetricsManager = goog.requireType('Blockly.MetricsManager'); +const {Metrics} = goog.requireType('Blockly.utils.Metrics'); /* eslint-disable-next-line no-unused-vars */ -const Size = goog.requireType('Blockly.utils.Size'); +const {Size} = goog.requireType('Blockly.utils.Size'); /** @@ -151,4 +151,4 @@ IMetricsManager.prototype.getContentMetrics; */ IMetricsManager.prototype.getMetrics; -exports = IMetricsManager; +exports.IMetricsManager = IMetricsManager; diff --git a/core/interfaces/i_movable.js b/core/interfaces/i_movable.js index 8ad5897b7..46fe61289 100644 --- a/core/interfaces/i_movable.js +++ b/core/interfaces/i_movable.js @@ -30,4 +30,4 @@ const IMovable = function() {}; */ IMovable.prototype.isMovable; -exports = IMovable; +exports.IMovable = IMovable; diff --git a/core/interfaces/i_positionable.js b/core/interfaces/i_positionable.js index a817ef601..82c49c3fe 100644 --- a/core/interfaces/i_positionable.js +++ b/core/interfaces/i_positionable.js @@ -17,11 +17,11 @@ goog.module('Blockly.IPositionable'); /* eslint-disable-next-line no-unused-vars */ -const IComponent = goog.require('Blockly.IComponent'); +const {IComponent} = goog.require('Blockly.IComponent'); /* eslint-disable-next-line no-unused-vars */ -const MetricsManager = goog.requireType('Blockly.MetricsManager'); +const {MetricsManager} = goog.requireType('Blockly.MetricsManager'); /* eslint-disable-next-line no-unused-vars */ -const Rect = goog.requireType('Blockly.utils.Rect'); +const {Rect} = goog.requireType('Blockly.utils.Rect'); /** @@ -48,4 +48,4 @@ IPositionable.prototype.position; */ IPositionable.prototype.getBoundingRectangle; -exports = IPositionable; +exports.IPositionable = IPositionable; diff --git a/core/interfaces/i_registrable.js b/core/interfaces/i_registrable.js index 552ebef5e..5c8e49d25 100644 --- a/core/interfaces/i_registrable.js +++ b/core/interfaces/i_registrable.js @@ -26,4 +26,4 @@ goog.module('Blockly.IRegistrable'); */ const IRegistrable = function() {}; -exports = IRegistrable; +exports.IRegistrable = IRegistrable; diff --git a/core/interfaces/i_registrable_field.js b/core/interfaces/i_registrable_field.js index 930c2d8c6..f3b9c47f4 100644 --- a/core/interfaces/i_registrable_field.js +++ b/core/interfaces/i_registrable_field.js @@ -17,7 +17,7 @@ goog.module('Blockly.IRegistrableField'); /* eslint-disable-next-line no-unused-vars */ -const Field = goog.requireType('Blockly.Field'); +const {Field} = goog.requireType('Blockly.Field'); /** @@ -36,4 +36,4 @@ let IRegistrableField = {}; */ IRegistrableField.fromJson; -exports = IRegistrableField; +exports.IRegistrableField = IRegistrableField; diff --git a/core/interfaces/i_selectable.js b/core/interfaces/i_selectable.js index c86a52749..9da3219a8 100644 --- a/core/interfaces/i_selectable.js +++ b/core/interfaces/i_selectable.js @@ -17,9 +17,9 @@ goog.module('Blockly.ISelectable'); // eslint-disable-next-line no-unused-vars -const IDeletable = goog.require('Blockly.IDeletable'); +const {IDeletable} = goog.require('Blockly.IDeletable'); // eslint-disable-next-line no-unused-vars -const IMovable = goog.require('Blockly.IMovable'); +const {IMovable} = goog.require('Blockly.IMovable'); /** @@ -48,4 +48,4 @@ ISelectable.prototype.select; */ ISelectable.prototype.unselect; -exports = ISelectable; +exports.ISelectable = ISelectable; diff --git a/core/interfaces/i_selectable_toolbox_item.js b/core/interfaces/i_selectable_toolbox_item.js index b68b7515d..048f7263a 100644 --- a/core/interfaces/i_selectable_toolbox_item.js +++ b/core/interfaces/i_selectable_toolbox_item.js @@ -16,10 +16,10 @@ */ goog.module('Blockly.ISelectableToolboxItem'); -/* eslint-disable-next-line no-unused-vars */ -const IToolboxItem = goog.require('Blockly.IToolboxItem'); /* eslint-disable-next-line no-unused-vars */ const toolbox = goog.requireType('Blockly.utils.toolbox'); +/* eslint-disable-next-line no-unused-vars */ +const {IToolboxItem} = goog.require('Blockly.IToolboxItem'); /** @@ -70,4 +70,4 @@ ISelectableToolboxItem.prototype.getClickTarget; */ ISelectableToolboxItem.prototype.onClick; -exports = ISelectableToolboxItem; +exports.ISelectableToolboxItem = ISelectableToolboxItem; diff --git a/core/interfaces/i_serializer.js b/core/interfaces/i_serializer.js index 90b319b56..05f707058 100644 --- a/core/interfaces/i_serializer.js +++ b/core/interfaces/i_serializer.js @@ -20,7 +20,7 @@ goog.module('Blockly.serialization.ISerializer'); goog.module.declareLegacyNamespace(); // eslint-disable-next-line no-unused-vars -const Workspace = goog.requireType('Blockly.Workspace'); +const {Workspace} = goog.requireType('Blockly.Workspace'); /** diff --git a/core/interfaces/i_styleable.js b/core/interfaces/i_styleable.js index 303fddd00..50d9bba70 100644 --- a/core/interfaces/i_styleable.js +++ b/core/interfaces/i_styleable.js @@ -36,4 +36,4 @@ IStyleable.prototype.addStyle; */ IStyleable.prototype.removeStyle; -exports = IStyleable; +exports.IStyleable = IStyleable; diff --git a/core/interfaces/i_toolbox.js b/core/interfaces/i_toolbox.js index 17adad9d3..273d9ce1d 100644 --- a/core/interfaces/i_toolbox.js +++ b/core/interfaces/i_toolbox.js @@ -16,16 +16,16 @@ */ goog.module('Blockly.IToolbox'); -/* eslint-disable-next-line no-unused-vars */ -const IFlyout = goog.requireType('Blockly.IFlyout'); -/* eslint-disable-next-line no-unused-vars */ -const IRegistrable = goog.require('Blockly.IRegistrable'); -/* eslint-disable-next-line no-unused-vars */ -const IToolboxItem = goog.requireType('Blockly.IToolboxItem'); -/* eslint-disable-next-line no-unused-vars */ -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 {IFlyout} = goog.requireType('Blockly.IFlyout'); +/* eslint-disable-next-line no-unused-vars */ +const {IRegistrable} = goog.require('Blockly.IRegistrable'); +/* eslint-disable-next-line no-unused-vars */ +const {IToolboxItem} = goog.requireType('Blockly.IToolboxItem'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg'); /** @@ -139,4 +139,4 @@ IToolbox.prototype.getSelectedItem; */ IToolbox.prototype.dispose; -exports = IToolbox; +exports.IToolbox = IToolbox; diff --git a/core/interfaces/i_toolbox_item.js b/core/interfaces/i_toolbox_item.js index f28c360af..8b20cf647 100644 --- a/core/interfaces/i_toolbox_item.js +++ b/core/interfaces/i_toolbox_item.js @@ -49,7 +49,7 @@ IToolboxItem.prototype.getId; /** * Gets the parent if the toolbox item is nested. - * @return {?Blockly.IToolboxItem} The parent toolbox item, or null if + * @return {?IToolboxItem} The parent toolbox item, or null if * this toolbox item is not nested. * @public */ @@ -82,4 +82,4 @@ IToolboxItem.prototype.isCollapsible; */ IToolboxItem.prototype.dispose; -exports = IToolboxItem; +exports.IToolboxItem = IToolboxItem; diff --git a/core/keyboard_nav/ast_node.js b/core/keyboard_nav/ast_node.js index cc509f22d..aed6f6ab8 100644 --- a/core/keyboard_nav/ast_node.js +++ b/core/keyboard_nav/ast_node.js @@ -17,22 +17,22 @@ */ goog.module('Blockly.ASTNode'); -/* eslint-disable-next-line no-unused-vars */ -const Connection = goog.requireType('Blockly.Connection'); -const Coordinate = goog.require('Blockly.utils.Coordinate'); -/* eslint-disable-next-line no-unused-vars */ -const Field = goog.requireType('Blockly.Field'); -/* eslint-disable-next-line no-unused-vars */ -const IASTNodeLocation = goog.requireType('Blockly.IASTNodeLocation'); -/* eslint-disable-next-line no-unused-vars */ -const IASTNodeLocationWithBlock = goog.requireType('Blockly.IASTNodeLocationWithBlock'); -/* eslint-disable-next-line no-unused-vars */ -const Input = goog.requireType('Blockly.Input'); -/* eslint-disable-next-line no-unused-vars */ -const Workspace = goog.requireType('Blockly.Workspace'); /* eslint-disable-next-line no-unused-vars */ const {Block} = goog.requireType('Blockly.Block'); const {ConnectionType} = goog.require('Blockly.ConnectionType'); +/* eslint-disable-next-line no-unused-vars */ +const {Connection} = goog.requireType('Blockly.Connection'); +const {Coordinate} = goog.require('Blockly.utils.Coordinate'); +/* eslint-disable-next-line no-unused-vars */ +const {Field} = goog.requireType('Blockly.Field'); +/* eslint-disable-next-line no-unused-vars */ +const {IASTNodeLocationWithBlock} = goog.requireType('Blockly.IASTNodeLocationWithBlock'); +/* eslint-disable-next-line no-unused-vars */ +const {IASTNodeLocation} = goog.requireType('Blockly.IASTNodeLocation'); +/* eslint-disable-next-line no-unused-vars */ +const {Input} = goog.requireType('Blockly.Input'); +/* eslint-disable-next-line no-unused-vars */ +const {Workspace} = goog.requireType('Blockly.Workspace'); /** diff --git a/core/keyboard_nav/marker.js b/core/keyboard_nav/marker.js index dadfc975b..a38ad0c8e 100644 --- a/core/keyboard_nav/marker.js +++ b/core/keyboard_nav/marker.js @@ -17,10 +17,10 @@ */ goog.module('Blockly.Marker'); -/* eslint-disable-next-line no-unused-vars */ -const MarkerSvg = goog.requireType('Blockly.blockRendering.MarkerSvg'); /* eslint-disable-next-line no-unused-vars */ const {ASTNode} = goog.requireType('Blockly.ASTNode'); +/* eslint-disable-next-line no-unused-vars */ +const {MarkerSvg} = goog.requireType('Blockly.blockRendering.MarkerSvg'); /** diff --git a/core/keyboard_nav/tab_navigate_cursor.js b/core/keyboard_nav/tab_navigate_cursor.js index 3f647ab86..88aaeb357 100644 --- a/core/keyboard_nav/tab_navigate_cursor.js +++ b/core/keyboard_nav/tab_navigate_cursor.js @@ -17,11 +17,11 @@ */ goog.module('Blockly.TabNavigateCursor'); -/* eslint-disable-next-line no-unused-vars */ -const Field = goog.requireType('Blockly.Field'); const object = goog.require('Blockly.utils.object'); const {ASTNode} = goog.require('Blockly.ASTNode'); const {BasicCursor} = goog.require('Blockly.BasicCursor'); +/* eslint-disable-next-line no-unused-vars */ +const {Field} = goog.requireType('Blockly.Field'); /** diff --git a/core/marker_manager.js b/core/marker_manager.js index bb6bd0e3d..035f6a4c4 100644 --- a/core/marker_manager.js +++ b/core/marker_manager.js @@ -15,12 +15,12 @@ */ goog.module('Blockly.MarkerManager'); -/* eslint-disable-next-line no-unused-vars */ -const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); /* eslint-disable-next-line no-unused-vars */ const {Cursor} = goog.requireType('Blockly.Cursor'); /* eslint-disable-next-line no-unused-vars */ const {Marker} = goog.requireType('Blockly.Marker'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg'); /** @@ -198,4 +198,4 @@ MarkerManager.prototype.dispose = function() { } }; -exports = MarkerManager; +exports.MarkerManager = MarkerManager; diff --git a/core/menu.js b/core/menu.js index e167e6125..a39b9c52c 100644 --- a/core/menu.js +++ b/core/menu.js @@ -15,16 +15,16 @@ */ goog.module('Blockly.Menu'); -const Coordinate = goog.require('Blockly.utils.Coordinate'); -/* eslint-disable-next-line no-unused-vars */ -const MenuItem = goog.requireType('Blockly.MenuItem'); -const KeyCodes = goog.require('Blockly.utils.KeyCodes'); -/* eslint-disable-next-line no-unused-vars */ -const Size = goog.requireType('Blockly.utils.Size'); const aria = goog.require('Blockly.utils.aria'); const browserEvents = goog.require('Blockly.browserEvents'); const dom = goog.require('Blockly.utils.dom'); const style = goog.require('Blockly.utils.style'); +const {Coordinate} = goog.require('Blockly.utils.Coordinate'); +const {KeyCodes} = goog.require('Blockly.utils.KeyCodes'); +/* eslint-disable-next-line no-unused-vars */ +const {MenuItem} = goog.requireType('Blockly.MenuItem'); +/* eslint-disable-next-line no-unused-vars */ +const {Size} = goog.requireType('Blockly.utils.Size'); /** @@ -474,4 +474,4 @@ Menu.prototype.getSize = function() { return menuSize; }; -exports = Menu; +exports.Menu = Menu; diff --git a/core/menuitem.js b/core/menuitem.js index 54d5fc4e9..f82f49922 100644 --- a/core/menuitem.js +++ b/core/menuitem.js @@ -283,4 +283,4 @@ MenuItem.prototype.onAction = function(fn, obj) { this.actionHandler_ = fn.bind(obj); }; -exports = MenuItem; +exports.MenuItem = MenuItem; diff --git a/core/metrics_manager.js b/core/metrics_manager.js index 6cc30c0e3..09335ad7d 100644 --- a/core/metrics_manager.js +++ b/core/metrics_manager.js @@ -15,19 +15,19 @@ */ goog.module('Blockly.MetricsManager'); -/* eslint-disable-next-line no-unused-vars */ -const IFlyout = goog.requireType('Blockly.IFlyout'); -/* eslint-disable-next-line no-unused-vars */ -const IMetricsManager = goog.require('Blockly.IMetricsManager'); -/* eslint-disable-next-line no-unused-vars */ -const IToolbox = goog.requireType('Blockly.IToolbox'); -/* eslint-disable-next-line no-unused-vars */ -const Metrics = goog.requireType('Blockly.utils.Metrics'); -const Size = goog.require('Blockly.utils.Size'); -/* eslint-disable-next-line no-unused-vars */ -const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); const registry = goog.require('Blockly.registry'); const toolboxUtils = goog.require('Blockly.utils.toolbox'); +/* eslint-disable-next-line no-unused-vars */ +const {IFlyout} = goog.requireType('Blockly.IFlyout'); +/* eslint-disable-next-line no-unused-vars */ +const {IMetricsManager} = goog.require('Blockly.IMetricsManager'); +/* eslint-disable-next-line no-unused-vars */ +const {IToolbox} = goog.requireType('Blockly.IToolbox'); +/* eslint-disable-next-line no-unused-vars */ +const {Metrics} = goog.requireType('Blockly.utils.Metrics'); +const {Size} = goog.require('Blockly.utils.Size'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg'); /** @@ -479,4 +479,4 @@ MetricsManager.prototype.getMetrics = function() { registry.register( registry.Type.METRICS_MANAGER, registry.DEFAULT, MetricsManager); -exports = MetricsManager; +exports.MetricsManager = MetricsManager; diff --git a/core/mutator.js b/core/mutator.js index b05a6b02c..022b54e40 100644 --- a/core/mutator.js +++ b/core/mutator.js @@ -19,30 +19,30 @@ goog.module('Blockly.Mutator'); /* eslint-disable-next-line no-unused-vars */ const Abstract = goog.requireType('Blockly.Events.Abstract'); -const BlockChange = goog.require('Blockly.Events.BlockChange'); -/* eslint-disable-next-line no-unused-vars */ -const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions'); -const Bubble = goog.require('Blockly.Bubble'); -/* eslint-disable-next-line no-unused-vars */ -const Connection = goog.requireType('Blockly.Connection'); -/* eslint-disable-next-line no-unused-vars */ -const Coordinate = goog.requireType('Blockly.utils.Coordinate'); -const Icon = goog.require('Blockly.Icon'); -const Options = goog.require('Blockly.Options'); -const Svg = goog.require('Blockly.utils.Svg'); -/* eslint-disable-next-line no-unused-vars */ -const Workspace = goog.requireType('Blockly.Workspace'); -const WorkspaceSvg = goog.require('Blockly.WorkspaceSvg'); const dom = goog.require('Blockly.utils.dom'); const eventUtils = goog.require('Blockly.Events.utils'); 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'); +const {BlockChange} = goog.require('Blockly.Events.BlockChange'); /* eslint-disable-next-line no-unused-vars */ const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); +/* eslint-disable-next-line no-unused-vars */ +const {BlocklyOptions} = goog.requireType('Blockly.BlocklyOptions'); +/* eslint-disable-next-line no-unused-vars */ +const {Block} = goog.requireType('Blockly.Block'); +const {Bubble} = goog.require('Blockly.Bubble'); +/* eslint-disable-next-line no-unused-vars */ +const {Connection} = goog.requireType('Blockly.Connection'); +/* eslint-disable-next-line no-unused-vars */ +const {Coordinate} = goog.requireType('Blockly.utils.Coordinate'); +const {Icon} = goog.require('Blockly.Icon'); +const {Options} = goog.require('Blockly.Options'); +const {Svg} = goog.require('Blockly.utils.Svg'); +const {WorkspaceSvg} = goog.require('Blockly.WorkspaceSvg'); +/* eslint-disable-next-line no-unused-vars */ +const {Workspace} = goog.requireType('Blockly.Workspace'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.BubbleOpen'); @@ -540,4 +540,4 @@ Mutator.findParentWs = function(workspace) { return outerWs; }; -exports = Mutator; +exports.Mutator = Mutator; diff --git a/core/names.js b/core/names.js index 15fcdf671..9ac8c1513 100644 --- a/core/names.js +++ b/core/names.js @@ -16,12 +16,12 @@ goog.module('Blockly.Names'); const Msg = goog.require('Blockly.Msg'); -/* eslint-disable-next-line no-unused-vars */ -const VariableMap = goog.requireType('Blockly.VariableMap'); const Variables = goog.require('Blockly.Variables'); -/* eslint-disable-next-line no-unused-vars */ -const Workspace = goog.requireType('Blockly.Workspace'); const internalConstants = goog.require('Blockly.internalConstants'); +/* eslint-disable-next-line no-unused-vars */ +const {VariableMap} = goog.requireType('Blockly.VariableMap'); +/* eslint-disable-next-line no-unused-vars */ +const {Workspace} = goog.requireType('Blockly.Workspace'); /** @suppress {extraRequire} */ goog.requireType('Blockly.Procedures'); @@ -242,4 +242,4 @@ Names.equals = function(name1, name2) { return name1.toLowerCase() === name2.toLowerCase(); }; -exports = Names; +exports.Names = Names; diff --git a/core/options.js b/core/options.js index 375e785e1..a83c61180 100644 --- a/core/options.js +++ b/core/options.js @@ -15,17 +15,17 @@ */ goog.module('Blockly.Options'); -/* eslint-disable-next-line no-unused-vars */ -const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions'); -const Classic = goog.require('Blockly.Themes.Classic'); -/* eslint-disable-next-line no-unused-vars */ -const Metrics = goog.requireType('Blockly.utils.Metrics'); -const Theme = goog.require('Blockly.Theme'); -/* eslint-disable-next-line no-unused-vars */ -const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); const idGenerator = goog.require('Blockly.utils.idGenerator'); const registry = goog.require('Blockly.registry'); const toolbox = goog.require('Blockly.utils.toolbox'); +/* eslint-disable-next-line no-unused-vars */ +const {BlocklyOptions} = goog.requireType('Blockly.BlocklyOptions'); +const {Classic} = goog.require('Blockly.Themes.Classic'); +/* eslint-disable-next-line no-unused-vars */ +const {Metrics} = goog.requireType('Blockly.utils.Metrics'); +const {Theme} = goog.require('Blockly.Theme'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg'); /** @@ -382,4 +382,4 @@ Options.parseThemeOptions_ = function(options) { theme.name || ('builtin' + idGenerator.getNextUniqueId()), theme); }; -exports = Options; +exports.Options = Options; diff --git a/core/positionable_helpers.js b/core/positionable_helpers.js index 4731d90e7..5fd88f1ab 100644 --- a/core/positionable_helpers.js +++ b/core/positionable_helpers.js @@ -15,15 +15,15 @@ */ goog.module('Blockly.uiPosition'); -/* 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'); +/* 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'); /** diff --git a/core/procedures.js b/core/procedures.js index c9523164f..0baaa9042 100644 --- a/core/procedures.js +++ b/core/procedures.js @@ -17,20 +17,20 @@ goog.module('Blockly.Procedures'); /* eslint-disable-next-line no-unused-vars */ const Abstract = goog.requireType('Blockly.Events.Abstract'); -/* eslint-disable-next-line no-unused-vars */ -const Field = goog.requireType('Blockly.Field'); const Msg = goog.require('Blockly.Msg'); -const Names = goog.require('Blockly.Names'); const Variables = goog.require('Blockly.Variables'); -const Workspace = goog.require('Blockly.Workspace'); -/* eslint-disable-next-line no-unused-vars */ -const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); const Xml = goog.require('Blockly.Xml'); const eventUtils = goog.require('Blockly.Events.utils'); const utilsXml = goog.require('Blockly.utils.xml'); +const {Blocks} = goog.require('Blockly.blocks'); /* eslint-disable-next-line no-unused-vars */ const {Block} = goog.requireType('Blockly.Block'); -const {Blocks} = goog.require('Blockly.blocks'); +/* eslint-disable-next-line no-unused-vars */ +const {Field} = goog.requireType('Blockly.Field'); +const {Names} = goog.require('Blockly.Names'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg'); +const {Workspace} = goog.require('Blockly.Workspace'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.BlockChange'); diff --git a/core/registry.js b/core/registry.js index 3076bfef6..b2420f86a 100644 --- a/core/registry.js +++ b/core/registry.js @@ -20,29 +20,29 @@ goog.module('Blockly.registry'); /* eslint-disable-next-line no-unused-vars */ const Abstract = goog.requireType('Blockly.Events.Abstract'); /* eslint-disable-next-line no-unused-vars */ -const Field = goog.requireType('Blockly.Field'); +const {Cursor} = goog.requireType('Blockly.Cursor'); /* eslint-disable-next-line no-unused-vars */ -const IBlockDragger = goog.requireType('Blockly.IBlockDragger'); +const {Field} = goog.requireType('Blockly.Field'); /* eslint-disable-next-line no-unused-vars */ -const IConnectionChecker = goog.requireType('Blockly.IConnectionChecker'); +const {IBlockDragger} = goog.requireType('Blockly.IBlockDragger'); /* eslint-disable-next-line no-unused-vars */ -const IFlyout = goog.requireType('Blockly.IFlyout'); +const {IConnectionChecker} = goog.requireType('Blockly.IConnectionChecker'); /* eslint-disable-next-line no-unused-vars */ -const IMetricsManager = goog.requireType('Blockly.IMetricsManager'); +const {IFlyout} = goog.requireType('Blockly.IFlyout'); /* eslint-disable-next-line no-unused-vars */ -const IToolbox = goog.requireType('Blockly.IToolbox'); -/* eslint-disable-next-line no-unused-vars */ -const Options = goog.requireType('Blockly.Options'); -/* eslint-disable-next-line no-unused-vars */ -const Renderer = goog.requireType('Blockly.blockRendering.Renderer'); -/* eslint-disable-next-line no-unused-vars */ -const Theme = goog.requireType('Blockly.Theme'); -/* eslint-disable-next-line no-unused-vars */ -const ToolboxItem = goog.requireType('Blockly.ToolboxItem'); +const {IMetricsManager} = goog.requireType('Blockly.IMetricsManager'); /* eslint-disable-next-line no-unused-vars */ const {ISerializer} = goog.requireType('Blockly.serialization.ISerializer'); /* eslint-disable-next-line no-unused-vars */ -const {Cursor} = goog.requireType('Blockly.Cursor'); +const {IToolbox} = goog.requireType('Blockly.IToolbox'); +/* eslint-disable-next-line no-unused-vars */ +const {Options} = goog.requireType('Blockly.Options'); +/* eslint-disable-next-line no-unused-vars */ +const {Renderer} = goog.requireType('Blockly.blockRendering.Renderer'); +/* eslint-disable-next-line no-unused-vars */ +const {Theme} = goog.requireType('Blockly.Theme'); +/* eslint-disable-next-line no-unused-vars */ +const {ToolboxItem} = goog.requireType('Blockly.ToolboxItem'); /** diff --git a/core/rendered_connection.js b/core/rendered_connection.js index 88e7ba77b..99e8cd1df 100644 --- a/core/rendered_connection.js +++ b/core/rendered_connection.js @@ -15,11 +15,6 @@ */ goog.module('Blockly.RenderedConnection'); -const Connection = goog.require('Blockly.Connection'); -/* eslint-disable-next-line no-unused-vars */ -const ConnectionDB = goog.requireType('Blockly.ConnectionDB'); -const Coordinate = goog.require('Blockly.utils.Coordinate'); -const Svg = goog.require('Blockly.utils.Svg'); const common = goog.require('Blockly.common'); const deprecation = goog.require('Blockly.utils.deprecation'); const dom = goog.require('Blockly.utils.dom'); @@ -29,10 +24,15 @@ 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 {BlockSvg} = goog.requireType('Blockly.BlockSvg'); +/* 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 {ConnectionDB} = goog.requireType('Blockly.ConnectionDB'); const {ConnectionType} = goog.require('Blockly.ConnectionType'); +const {Connection} = goog.require('Blockly.Connection'); +const {Coordinate} = goog.require('Blockly.utils.Coordinate'); +const {Svg} = goog.require('Blockly.utils.Svg'); /** @@ -589,4 +589,4 @@ RenderedConnection.prototype.onCheckChanged_ = function() { } }; -exports = RenderedConnection; +exports.RenderedConnection = RenderedConnection; diff --git a/core/renderers/common/block_rendering.js b/core/renderers/common/block_rendering.js index b99f3be1f..b17a5cb14 100644 --- a/core/renderers/common/block_rendering.js +++ b/core/renderers/common/block_rendering.js @@ -15,41 +15,41 @@ */ goog.module('Blockly.blockRendering'); -const BottomRow = goog.require('Blockly.blockRendering.BottomRow'); -const Connection = goog.require('Blockly.blockRendering.Connection'); -const ConstantProvider = goog.require('Blockly.blockRendering.ConstantProvider'); -const Debug = goog.require('Blockly.blockRendering.Debug'); -const Drawer = goog.require('Blockly.blockRendering.Drawer'); -const ExternalValueInput = goog.require('Blockly.blockRendering.ExternalValueInput'); -const Field = goog.require('Blockly.blockRendering.Field'); -const Hat = goog.require('Blockly.blockRendering.Hat'); -const Icon = goog.require('Blockly.blockRendering.Icon'); -const InRowSpacer = goog.require('Blockly.blockRendering.InRowSpacer'); -const InlineInput = goog.require('Blockly.blockRendering.InlineInput'); -const InputConnection = goog.require('Blockly.blockRendering.InputConnection'); -const InputRow = goog.require('Blockly.blockRendering.InputRow'); -const IPathObject = goog.require('Blockly.blockRendering.IPathObject'); -const JaggedEdge = goog.require('Blockly.blockRendering.JaggedEdge'); -const MarkerSvg = goog.require('Blockly.blockRendering.MarkerSvg'); -const Measurable = goog.require('Blockly.blockRendering.Measurable'); -const NextConnection = goog.require('Blockly.blockRendering.NextConnection'); -const OutputConnection = goog.require('Blockly.blockRendering.OutputConnection'); -const PathObject = goog.require('Blockly.blockRendering.PathObject'); -const PreviousConnection = goog.require('Blockly.blockRendering.PreviousConnection'); -const Renderer = goog.require('Blockly.blockRendering.Renderer'); -const RenderInfo = goog.require('Blockly.blockRendering.RenderInfo'); -const RoundCorner = goog.require('Blockly.blockRendering.RoundCorner'); -const Row = goog.require('Blockly.blockRendering.Row'); -const SpacerRow = goog.require('Blockly.blockRendering.SpacerRow'); -const SquareCorner = goog.require('Blockly.blockRendering.SquareCorner'); -const StatementInput = goog.require('Blockly.blockRendering.StatementInput'); -/* eslint-disable-next-line no-unused-vars */ -const Theme = goog.requireType('Blockly.Theme'); -const TopRow = goog.require('Blockly.blockRendering.TopRow'); -const Types = goog.require('Blockly.blockRendering.Types'); const debug = goog.require('Blockly.blockRendering.debug'); const deprecation = goog.require('Blockly.utils.deprecation'); const registry = goog.require('Blockly.registry'); +const {BottomRow} = goog.require('Blockly.blockRendering.BottomRow'); +const {Connection} = goog.require('Blockly.blockRendering.Connection'); +const {ConstantProvider} = goog.require('Blockly.blockRendering.ConstantProvider'); +const {Debug} = goog.require('Blockly.blockRendering.Debug'); +const {Drawer} = goog.require('Blockly.blockRendering.Drawer'); +const {ExternalValueInput} = goog.require('Blockly.blockRendering.ExternalValueInput'); +const {Field} = goog.require('Blockly.blockRendering.Field'); +const {Hat} = goog.require('Blockly.blockRendering.Hat'); +const {IPathObject} = goog.require('Blockly.blockRendering.IPathObject'); +const {Icon} = goog.require('Blockly.blockRendering.Icon'); +const {InRowSpacer} = goog.require('Blockly.blockRendering.InRowSpacer'); +const {InlineInput} = goog.require('Blockly.blockRendering.InlineInput'); +const {InputConnection} = goog.require('Blockly.blockRendering.InputConnection'); +const {InputRow} = goog.require('Blockly.blockRendering.InputRow'); +const {JaggedEdge} = goog.require('Blockly.blockRendering.JaggedEdge'); +const {MarkerSvg} = goog.require('Blockly.blockRendering.MarkerSvg'); +const {Measurable} = goog.require('Blockly.blockRendering.Measurable'); +const {NextConnection} = goog.require('Blockly.blockRendering.NextConnection'); +const {OutputConnection} = goog.require('Blockly.blockRendering.OutputConnection'); +const {PathObject} = goog.require('Blockly.blockRendering.PathObject'); +const {PreviousConnection} = goog.require('Blockly.blockRendering.PreviousConnection'); +const {RenderInfo} = goog.require('Blockly.blockRendering.RenderInfo'); +const {Renderer} = goog.require('Blockly.blockRendering.Renderer'); +const {RoundCorner} = goog.require('Blockly.blockRendering.RoundCorner'); +const {Row} = goog.require('Blockly.blockRendering.Row'); +const {SpacerRow} = goog.require('Blockly.blockRendering.SpacerRow'); +const {SquareCorner} = goog.require('Blockly.blockRendering.SquareCorner'); +const {StatementInput} = goog.require('Blockly.blockRendering.StatementInput'); +/* eslint-disable-next-line no-unused-vars */ +const {Theme} = goog.requireType('Blockly.Theme'); +const {TopRow} = goog.require('Blockly.blockRendering.TopRow'); +const {Types} = goog.require('Blockly.blockRendering.Types'); /** * Returns whether the debugger is turned on. diff --git a/core/renderers/common/constants.js b/core/renderers/common/constants.js index 090db3e60..6f68f6cbd 100644 --- a/core/renderers/common/constants.js +++ b/core/renderers/common/constants.js @@ -15,11 +15,6 @@ */ goog.module('Blockly.blockRendering.ConstantProvider'); -/* eslint-disable-next-line no-unused-vars */ -const RenderedConnection = goog.requireType('Blockly.RenderedConnection'); -const Svg = goog.require('Blockly.utils.Svg'); -/* eslint-disable-next-line no-unused-vars */ -const Theme = goog.requireType('Blockly.Theme'); const colour = goog.require('Blockly.utils.colour'); const dom = goog.require('Blockly.utils.dom'); const object = goog.require('Blockly.utils.object'); @@ -27,6 +22,11 @@ const svgPaths = goog.require('Blockly.utils.svgPaths'); const userAgent = goog.require('Blockly.utils.userAgent'); const utils = goog.require('Blockly.utils'); const {ConnectionType} = goog.require('Blockly.ConnectionType'); +/* eslint-disable-next-line no-unused-vars */ +const {RenderedConnection} = goog.requireType('Blockly.RenderedConnection'); +const {Svg} = goog.require('Blockly.utils.Svg'); +/* eslint-disable-next-line no-unused-vars */ +const {Theme} = goog.requireType('Blockly.Theme'); /** @@ -1224,4 +1224,4 @@ ConstantProvider.prototype.getCSS_ = function(selector) { ]; }; -exports = ConstantProvider; +exports.ConstantProvider = ConstantProvider; diff --git a/core/renderers/common/debugger.js b/core/renderers/common/debugger.js index fa114559d..411192a1e 100644 --- a/core/renderers/common/debugger.js +++ b/core/renderers/common/debugger.js @@ -15,25 +15,25 @@ */ goog.module('Blockly.blockRendering.Debug'); -/* eslint-disable-next-line no-unused-vars */ -const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); -const FieldLabel = goog.require('Blockly.FieldLabel'); -/* eslint-disable-next-line no-unused-vars */ -const InRowSpacer = goog.requireType('Blockly.blockRendering.InRowSpacer'); -/* eslint-disable-next-line no-unused-vars */ -const Measurable = goog.requireType('Blockly.blockRendering.Measurable'); -/* eslint-disable-next-line no-unused-vars */ -const RenderedConnection = goog.requireType('Blockly.RenderedConnection'); -/* eslint-disable-next-line no-unused-vars */ -const RenderInfo = goog.requireType('Blockly.blockRendering.RenderInfo'); -/* eslint-disable-next-line no-unused-vars */ -const Row = goog.requireType('Blockly.blockRendering.Row'); -const Svg = goog.require('Blockly.utils.Svg'); -const Types = goog.require('Blockly.blockRendering.Types'); const dom = goog.require('Blockly.utils.dom'); /* eslint-disable-next-line no-unused-vars */ const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); const {ConnectionType} = goog.require('Blockly.ConnectionType'); +/* eslint-disable-next-line no-unused-vars */ +const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider'); +const {FieldLabel} = goog.require('Blockly.FieldLabel'); +/* eslint-disable-next-line no-unused-vars */ +const {InRowSpacer} = goog.requireType('Blockly.blockRendering.InRowSpacer'); +/* eslint-disable-next-line no-unused-vars */ +const {Measurable} = goog.requireType('Blockly.blockRendering.Measurable'); +/* eslint-disable-next-line no-unused-vars */ +const {RenderInfo} = goog.requireType('Blockly.blockRendering.RenderInfo'); +/* eslint-disable-next-line no-unused-vars */ +const {RenderedConnection} = goog.requireType('Blockly.RenderedConnection'); +/* eslint-disable-next-line no-unused-vars */ +const {Row} = goog.requireType('Blockly.blockRendering.Row'); +const {Svg} = goog.require('Blockly.utils.Svg'); +const {Types} = goog.require('Blockly.blockRendering.Types'); /** @@ -432,4 +432,4 @@ Debug.prototype.drawRender = function(svgPath) { }, 100); }; -exports = Debug; +exports.Debug = Debug; diff --git a/core/renderers/common/drawer.js b/core/renderers/common/drawer.js index 7f0a9407a..ad58c34e1 100644 --- a/core/renderers/common/drawer.js +++ b/core/renderers/common/drawer.js @@ -15,23 +15,23 @@ */ goog.module('Blockly.blockRendering.Drawer'); -/* eslint-disable-next-line no-unused-vars */ -const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); -/* eslint-disable-next-line no-unused-vars */ -const Field = goog.requireType('Blockly.blockRendering.Field'); -/* eslint-disable-next-line no-unused-vars */ -const Icon = goog.requireType('Blockly.blockRendering.Icon'); -/* eslint-disable-next-line no-unused-vars */ -const InlineInput = goog.requireType('Blockly.blockRendering.InlineInput'); -/* eslint-disable-next-line no-unused-vars */ -const RenderInfo = goog.requireType('Blockly.blockRendering.RenderInfo'); -/* eslint-disable-next-line no-unused-vars */ -const Row = goog.requireType('Blockly.blockRendering.Row'); -const Types = goog.require('Blockly.blockRendering.Types'); const debug = goog.require('Blockly.blockRendering.debug'); const svgPaths = goog.require('Blockly.utils.svgPaths'); /* 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 */ +const {Field} = goog.requireType('Blockly.blockRendering.Field'); +/* eslint-disable-next-line no-unused-vars */ +const {Icon} = goog.requireType('Blockly.blockRendering.Icon'); +/* eslint-disable-next-line no-unused-vars */ +const {InlineInput} = goog.requireType('Blockly.blockRendering.InlineInput'); +/* eslint-disable-next-line no-unused-vars */ +const {RenderInfo} = goog.requireType('Blockly.blockRendering.RenderInfo'); +/* eslint-disable-next-line no-unused-vars */ +const {Row} = goog.requireType('Blockly.blockRendering.Row'); +const {Types} = goog.require('Blockly.blockRendering.Types'); /** @@ -462,4 +462,4 @@ Drawer.prototype.positionOutputConnection_ = function() { } }; -exports = Drawer; +exports.Drawer = Drawer; diff --git a/core/renderers/common/i_path_object.js b/core/renderers/common/i_path_object.js index 85907edcc..d8388e715 100644 --- a/core/renderers/common/i_path_object.js +++ b/core/renderers/common/i_path_object.js @@ -18,12 +18,12 @@ */ goog.module('Blockly.blockRendering.IPathObject'); -/* 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'); +/* 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'); /** @@ -159,4 +159,4 @@ IPathObject.prototype.updateMovable; */ IPathObject.prototype.updateReplacementFade; -exports = IPathObject; +exports.IPathObject = IPathObject; diff --git a/core/renderers/common/info.js b/core/renderers/common/info.js index b7fc6fe18..8267b11f2 100644 --- a/core/renderers/common/info.js +++ b/core/renderers/common/info.js @@ -15,40 +15,40 @@ */ goog.module('Blockly.blockRendering.RenderInfo'); -const BottomRow = goog.require('Blockly.blockRendering.BottomRow'); -/* eslint-disable-next-line no-unused-vars */ -const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); -const ExternalValueInput = goog.require('Blockly.blockRendering.ExternalValueInput'); -const Field = goog.require('Blockly.blockRendering.Field'); -const Hat = goog.require('Blockly.blockRendering.Hat'); -const Icon = goog.require('Blockly.blockRendering.Icon'); -const InlineInput = goog.require('Blockly.blockRendering.InlineInput'); -/* eslint-disable-next-line no-unused-vars */ -const Input = goog.requireType('Blockly.Input'); -const InputRow = goog.require('Blockly.blockRendering.InputRow'); -const InRowSpacer = goog.require('Blockly.blockRendering.InRowSpacer'); -const JaggedEdge = goog.require('Blockly.blockRendering.JaggedEdge'); -/* eslint-disable-next-line no-unused-vars */ -const Measurable = goog.requireType('Blockly.blockRendering.Measurable'); -const NextConnection = goog.require('Blockly.blockRendering.NextConnection'); -const OutputConnection = goog.require('Blockly.blockRendering.OutputConnection'); -const PreviousConnection = goog.require('Blockly.blockRendering.PreviousConnection'); -/* eslint-disable-next-line no-unused-vars */ -const RenderedConnection = goog.requireType('Blockly.RenderedConnection'); -/* eslint-disable-next-line no-unused-vars */ -const Renderer = goog.requireType('Blockly.blockRendering.Renderer'); -const RoundCorner = goog.require('Blockly.blockRendering.RoundCorner'); -/* eslint-disable-next-line no-unused-vars */ -const Row = goog.requireType('Blockly.blockRendering.Row'); -const SpacerRow = goog.require('Blockly.blockRendering.SpacerRow'); -const SquareCorner = goog.require('Blockly.blockRendering.SquareCorner'); -const StatementInput = goog.require('Blockly.blockRendering.StatementInput'); -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'); +const {BottomRow} = goog.require('Blockly.blockRendering.BottomRow'); +/* eslint-disable-next-line no-unused-vars */ +const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider'); +const {ExternalValueInput} = goog.require('Blockly.blockRendering.ExternalValueInput'); +const {Field} = goog.require('Blockly.blockRendering.Field'); +const {Hat} = goog.require('Blockly.blockRendering.Hat'); +const {Icon} = goog.require('Blockly.blockRendering.Icon'); +const {InRowSpacer} = goog.require('Blockly.blockRendering.InRowSpacer'); +const {InlineInput} = goog.require('Blockly.blockRendering.InlineInput'); +const {InputRow} = goog.require('Blockly.blockRendering.InputRow'); +/* eslint-disable-next-line no-unused-vars */ +const {Input} = goog.requireType('Blockly.Input'); +const {JaggedEdge} = goog.require('Blockly.blockRendering.JaggedEdge'); +/* eslint-disable-next-line no-unused-vars */ +const {Measurable} = goog.requireType('Blockly.blockRendering.Measurable'); +const {NextConnection} = goog.require('Blockly.blockRendering.NextConnection'); +const {OutputConnection} = goog.require('Blockly.blockRendering.OutputConnection'); +const {PreviousConnection} = goog.require('Blockly.blockRendering.PreviousConnection'); +/* eslint-disable-next-line no-unused-vars */ +const {RenderedConnection} = goog.requireType('Blockly.RenderedConnection'); +/* eslint-disable-next-line no-unused-vars */ +const {Renderer} = goog.requireType('Blockly.blockRendering.Renderer'); +const {RoundCorner} = goog.require('Blockly.blockRendering.RoundCorner'); +/* eslint-disable-next-line no-unused-vars */ +const {Row} = goog.requireType('Blockly.blockRendering.Row'); +const {SpacerRow} = goog.require('Blockly.blockRendering.SpacerRow'); +const {SquareCorner} = goog.require('Blockly.blockRendering.SquareCorner'); +const {StatementInput} = goog.require('Blockly.blockRendering.StatementInput'); +const {TopRow} = goog.require('Blockly.blockRendering.TopRow'); +const {Types} = goog.require('Blockly.blockRendering.Types'); +const {inputTypes} = goog.require('Blockly.inputTypes'); /** @@ -764,4 +764,4 @@ RenderInfo.prototype.finalize_ = function() { this.bottomRow.baseline = yCursor - this.bottomRow.descenderHeight; }; -exports = RenderInfo; +exports.RenderInfo = RenderInfo; diff --git a/core/renderers/common/marker_svg.js b/core/renderers/common/marker_svg.js index cd766939a..151b8aaf0 100644 --- a/core/renderers/common/marker_svg.js +++ b/core/renderers/common/marker_svg.js @@ -16,19 +16,6 @@ */ goog.module('Blockly.blockRendering.MarkerSvg'); -/* 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'); -/* eslint-disable-next-line no-unused-vars */ -const Field = goog.requireType('Blockly.Field'); -/* eslint-disable-next-line no-unused-vars */ -const IASTNodeLocationSvg = goog.requireType('Blockly.IASTNodeLocationSvg'); -/* eslint-disable-next-line no-unused-vars */ -const RenderedConnection = goog.requireType('Blockly.RenderedConnection'); -const Svg = goog.require('Blockly.utils.Svg'); -/* eslint-disable-next-line no-unused-vars */ -const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); const dom = goog.require('Blockly.utils.dom'); const eventUtils = goog.require('Blockly.Events.utils'); const svgPaths = goog.require('Blockly.utils.svgPaths'); @@ -37,7 +24,20 @@ const {ASTNode} = goog.require('Blockly.ASTNode'); const {BlockSvg} = goog.requireType('Blockly.BlockSvg'); const {ConnectionType} = goog.require('Blockly.ConnectionType'); /* 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'); +/* eslint-disable-next-line no-unused-vars */ +const {Field} = goog.requireType('Blockly.Field'); +/* eslint-disable-next-line no-unused-vars */ +const {IASTNodeLocationSvg} = goog.requireType('Blockly.IASTNodeLocationSvg'); +/* eslint-disable-next-line no-unused-vars */ const {Marker} = goog.requireType('Blockly.Marker'); +/* eslint-disable-next-line no-unused-vars */ +const {RenderedConnection} = goog.requireType('Blockly.RenderedConnection'); +const {Svg} = goog.require('Blockly.utils.Svg'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.MarkerMove'); @@ -681,4 +681,4 @@ MarkerSvg.prototype.dispose = function() { } }; -exports = MarkerSvg; +exports.MarkerSvg = MarkerSvg; diff --git a/core/renderers/common/path_object.js b/core/renderers/common/path_object.js index 09f0105bd..7898078c8 100644 --- a/core/renderers/common/path_object.js +++ b/core/renderers/common/path_object.js @@ -16,18 +16,18 @@ */ goog.module('Blockly.blockRendering.PathObject'); -/* 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'); -/* eslint-disable-next-line no-unused-vars */ -const IPathObject = goog.require('Blockly.blockRendering.IPathObject'); -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'); +/* 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'); +/* eslint-disable-next-line no-unused-vars */ +const {IPathObject} = goog.require('Blockly.blockRendering.IPathObject'); +const {Svg} = goog.require('Blockly.utils.Svg'); +/* eslint-disable-next-line no-unused-vars */ +const {Theme} = goog.requireType('Blockly.Theme'); /** @@ -277,4 +277,4 @@ PathObject.prototype.updateShapeForInputHighlight = function(_conn, _enable) { // NOP }; -exports = PathObject; +exports.PathObject = PathObject; diff --git a/core/renderers/common/renderer.js b/core/renderers/common/renderer.js index 1c6bfa139..da754653f 100644 --- a/core/renderers/common/renderer.js +++ b/core/renderers/common/renderer.js @@ -15,34 +15,34 @@ */ goog.module('Blockly.blockRendering.Renderer'); -const Connection = goog.require('Blockly.Connection'); -const ConstantProvider = goog.require('Blockly.blockRendering.ConstantProvider'); -/* eslint-disable-next-line no-unused-vars */ -const Debug = goog.requireType('Blockly.blockRendering.Debug'); -const Drawer = goog.require('Blockly.blockRendering.Drawer'); -const InsertionMarkerManager = goog.require('Blockly.InsertionMarkerManager'); -/* eslint-disable-next-line no-unused-vars */ -const IRegistrable = goog.require('Blockly.IRegistrable'); -/* eslint-disable-next-line no-unused-vars */ -const IPathObject = goog.requireType('Blockly.blockRendering.IPathObject'); -const MarkerSvg = goog.require('Blockly.blockRendering.MarkerSvg'); -const PathObject = goog.require('Blockly.blockRendering.PathObject'); -/* eslint-disable-next-line no-unused-vars */ -const RenderedConnection = goog.requireType('Blockly.RenderedConnection'); -const RenderInfo = goog.require('Blockly.blockRendering.RenderInfo'); -/* eslint-disable-next-line no-unused-vars */ -const Theme = goog.requireType('Blockly.Theme'); -/* eslint-disable-next-line no-unused-vars */ -const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); const debug = goog.require('Blockly.blockRendering.debug'); 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'); +/* eslint-disable-next-line no-unused-vars */ +const {Block} = goog.requireType('Blockly.Block'); const {ConnectionType} = goog.require('Blockly.ConnectionType'); +const {Connection} = goog.require('Blockly.Connection'); +const {ConstantProvider} = goog.require('Blockly.blockRendering.ConstantProvider'); +/* eslint-disable-next-line no-unused-vars */ +const {Debug} = goog.requireType('Blockly.blockRendering.Debug'); +const {Drawer} = goog.require('Blockly.blockRendering.Drawer'); +/* eslint-disable-next-line no-unused-vars */ +const {IPathObject} = goog.requireType('Blockly.blockRendering.IPathObject'); +/* eslint-disable-next-line no-unused-vars */ +const {IRegistrable} = goog.require('Blockly.IRegistrable'); +const {InsertionMarkerManager} = goog.require('Blockly.InsertionMarkerManager'); +const {MarkerSvg} = goog.require('Blockly.blockRendering.MarkerSvg'); /* eslint-disable-next-line no-unused-vars */ const {Marker} = goog.requireType('Blockly.Marker'); +const {PathObject} = goog.require('Blockly.blockRendering.PathObject'); +const {RenderInfo} = goog.require('Blockly.blockRendering.RenderInfo'); +/* eslint-disable-next-line no-unused-vars */ +const {RenderedConnection} = goog.requireType('Blockly.RenderedConnection'); +/* eslint-disable-next-line no-unused-vars */ +const {Theme} = goog.requireType('Blockly.Theme'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg'); /** @@ -182,7 +182,7 @@ Renderer.prototype.makeDrawer_ = function(block, info) { * @protected */ Renderer.prototype.makeDebugger_ = function() { - const Debug = goog.module.get('Blockly.blockRendering.Debug'); + const {Debug} = goog.module.get('Blockly.blockRendering.Debug'); if (!Debug) { throw Error('Missing require for Blockly.blockRendering.Debug'); } @@ -300,4 +300,4 @@ Renderer.prototype.render = function(block) { this.makeDrawer_(block, info).draw(); }; -exports = Renderer; +exports.Renderer = Renderer; diff --git a/core/renderers/geras/constants.js b/core/renderers/geras/constants.js index f1a6d8385..43db9d91e 100644 --- a/core/renderers/geras/constants.js +++ b/core/renderers/geras/constants.js @@ -17,8 +17,8 @@ */ goog.module('Blockly.geras.ConstantProvider'); -const BaseConstantProvider = goog.require('Blockly.blockRendering.ConstantProvider'); const object = goog.require('Blockly.utils.object'); +const {ConstantProvider: BaseConstantProvider} = goog.require('Blockly.blockRendering.ConstantProvider'); /** @@ -71,4 +71,4 @@ ConstantProvider.prototype.getCSS_ = function(selector) { ]); }; -exports = ConstantProvider; +exports.ConstantProvider = ConstantProvider; diff --git a/core/renderers/geras/drawer.js b/core/renderers/geras/drawer.js index e6277f26b..c56b6e5fe 100644 --- a/core/renderers/geras/drawer.js +++ b/core/renderers/geras/drawer.js @@ -15,17 +15,17 @@ */ goog.module('Blockly.geras.Drawer'); -const BaseDrawer = goog.require('Blockly.blockRendering.Drawer'); -const Highlighter = goog.require('Blockly.geras.Highlighter'); -/* eslint-disable-next-line no-unused-vars */ -const PathObject = goog.requireType('Blockly.geras.PathObject'); -/* eslint-disable-next-line no-unused-vars */ -const RenderInfo = goog.requireType('Blockly.geras.RenderInfo'); const debug = goog.require('Blockly.blockRendering.debug'); 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'); +const {Drawer: BaseDrawer} = goog.require('Blockly.blockRendering.Drawer'); +const {Highlighter} = goog.require('Blockly.geras.Highlighter'); +/* eslint-disable-next-line no-unused-vars */ +const {PathObject} = goog.requireType('Blockly.geras.PathObject'); +/* eslint-disable-next-line no-unused-vars */ +const {RenderInfo} = goog.requireType('Blockly.geras.RenderInfo'); /** @@ -209,4 +209,4 @@ Drawer.prototype.positionNextConnection_ = function() { } }; -exports = Drawer; +exports.Drawer = Drawer; diff --git a/core/renderers/geras/geras.js b/core/renderers/geras/geras.js index 02639276f..bf51bac4a 100644 --- a/core/renderers/geras/geras.js +++ b/core/renderers/geras/geras.js @@ -15,15 +15,15 @@ */ goog.module('Blockly.geras'); -const ConstantProvider = goog.require('Blockly.geras.ConstantProvider'); -const Drawer = goog.require('Blockly.geras.Drawer'); -const HighlightConstantProvider = goog.require('Blockly.geras.HighlightConstantProvider'); -const Highlighter = goog.require('Blockly.geras.Highlighter'); -const InlineInput = goog.require('Blockly.geras.InlineInput'); -const PathObject = goog.require('Blockly.geras.PathObject'); -const RenderInfo = goog.require('Blockly.geras.RenderInfo'); -const Renderer = goog.require('Blockly.geras.Renderer'); -const StatementInput = goog.require('Blockly.geras.StatementInput'); +const {ConstantProvider} = goog.require('Blockly.geras.ConstantProvider'); +const {Drawer} = goog.require('Blockly.geras.Drawer'); +const {HighlightConstantProvider} = goog.require('Blockly.geras.HighlightConstantProvider'); +const {Highlighter} = goog.require('Blockly.geras.Highlighter'); +const {InlineInput} = goog.require('Blockly.geras.InlineInput'); +const {PathObject} = goog.require('Blockly.geras.PathObject'); +const {RenderInfo} = goog.require('Blockly.geras.RenderInfo'); +const {Renderer} = goog.require('Blockly.geras.Renderer'); +const {StatementInput} = goog.require('Blockly.geras.StatementInput'); exports.ConstantProvider = ConstantProvider; exports.Drawer = Drawer; diff --git a/core/renderers/geras/highlight_constants.js b/core/renderers/geras/highlight_constants.js index f2ed34c62..2712ac953 100644 --- a/core/renderers/geras/highlight_constants.js +++ b/core/renderers/geras/highlight_constants.js @@ -15,9 +15,9 @@ */ goog.module('Blockly.geras.HighlightConstantProvider'); -/* eslint-disable-next-line no-unused-vars */ -const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); const svgPaths = goog.require('Blockly.utils.svgPaths'); +/* eslint-disable-next-line no-unused-vars */ +const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider'); /** @@ -287,4 +287,4 @@ HighlightConstantProvider.prototype.makeStartHat = function() { }; }; -exports = HighlightConstantProvider; +exports.HighlightConstantProvider = HighlightConstantProvider; diff --git a/core/renderers/geras/highlighter.js b/core/renderers/geras/highlighter.js index a21ace08b..e54d26837 100644 --- a/core/renderers/geras/highlighter.js +++ b/core/renderers/geras/highlighter.js @@ -17,16 +17,16 @@ */ goog.module('Blockly.geras.Highlighter'); -/* eslint-disable-next-line no-unused-vars */ -const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); -/* eslint-disable-next-line no-unused-vars */ -const HighlightConstantProvider = goog.requireType('Blockly.geras.HighlightConstantProvider'); -/* eslint-disable-next-line no-unused-vars */ -const Renderer = goog.requireType('Blockly.geras.Renderer'); -/* eslint-disable-next-line no-unused-vars */ -const RenderInfo = goog.requireType('Blockly.geras.RenderInfo'); -const Types = goog.require('Blockly.blockRendering.Types'); const svgPaths = goog.require('Blockly.utils.svgPaths'); +/* eslint-disable-next-line no-unused-vars */ +const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider'); +/* eslint-disable-next-line no-unused-vars */ +const {HighlightConstantProvider} = goog.requireType('Blockly.geras.HighlightConstantProvider'); +/* eslint-disable-next-line no-unused-vars */ +const {RenderInfo} = goog.requireType('Blockly.geras.RenderInfo'); +/* eslint-disable-next-line no-unused-vars */ +const {Renderer} = goog.requireType('Blockly.geras.Renderer'); +const {Types} = goog.require('Blockly.blockRendering.Types'); /** @@ -256,4 +256,4 @@ Highlighter.prototype.drawInlineInput = function(input) { } }; -exports = Highlighter; +exports.Highlighter = Highlighter; diff --git a/core/renderers/geras/info.js b/core/renderers/geras/info.js index b4fd2f991..a78ab4ab7 100644 --- a/core/renderers/geras/info.js +++ b/core/renderers/geras/info.js @@ -17,22 +17,22 @@ */ goog.module('Blockly.geras.RenderInfo'); -const BaseRenderInfo = goog.require('Blockly.blockRendering.RenderInfo'); -const ExternalValueInput = goog.require('Blockly.blockRendering.ExternalValueInput'); -/* eslint-disable-next-line no-unused-vars */ -const Field = goog.requireType('Blockly.blockRendering.Field'); -const InlineInput = goog.require('Blockly.geras.InlineInput'); -/* eslint-disable-next-line no-unused-vars */ -const InputRow = goog.requireType('Blockly.blockRendering.InputRow'); -const InRowSpacer = goog.require('Blockly.blockRendering.InRowSpacer'); -/* eslint-disable-next-line no-unused-vars */ -const Renderer = goog.requireType('Blockly.geras.Renderer'); -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'); +const {ExternalValueInput} = goog.require('Blockly.blockRendering.ExternalValueInput'); +/* eslint-disable-next-line no-unused-vars */ +const {Field} = goog.requireType('Blockly.blockRendering.Field'); +const {InRowSpacer} = goog.require('Blockly.blockRendering.InRowSpacer'); +const {InlineInput} = goog.require('Blockly.geras.InlineInput'); +/* eslint-disable-next-line no-unused-vars */ +const {InputRow} = goog.requireType('Blockly.blockRendering.InputRow'); +const {RenderInfo: BaseRenderInfo} = goog.require('Blockly.blockRendering.RenderInfo'); +/* eslint-disable-next-line no-unused-vars */ +const {Renderer} = goog.requireType('Blockly.geras.Renderer'); +const {StatementInput} = goog.require('Blockly.geras.StatementInput'); +const {Types} = goog.require('Blockly.blockRendering.Types'); +const {inputTypes} = goog.require('Blockly.inputTypes'); /** @@ -462,4 +462,4 @@ RenderInfo.prototype.finalize_ = function() { this.startY = this.topRow.capline; }; -exports = RenderInfo; +exports.RenderInfo = RenderInfo; diff --git a/core/renderers/geras/measurables/inline_input.js b/core/renderers/geras/measurables/inline_input.js index bb3cc5ddc..5df435181 100644 --- a/core/renderers/geras/measurables/inline_input.js +++ b/core/renderers/geras/measurables/inline_input.js @@ -17,12 +17,12 @@ */ goog.module('Blockly.geras.InlineInput'); -const BaseInlineInput = goog.require('Blockly.blockRendering.InlineInput'); -/* eslint-disable-next-line no-unused-vars */ -const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); -/* eslint-disable-next-line no-unused-vars */ -const Input = goog.requireType('Blockly.Input'); const object = goog.require('Blockly.utils.object'); +/* eslint-disable-next-line no-unused-vars */ +const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider'); +const {InlineInput: BaseInlineInput} = goog.require('Blockly.blockRendering.InlineInput'); +/* eslint-disable-next-line no-unused-vars */ +const {Input} = goog.requireType('Blockly.Input'); /** @@ -49,4 +49,4 @@ const InlineInput = function(constants, input) { }; object.inherits(InlineInput, BaseInlineInput); -exports = InlineInput; +exports.InlineInput = InlineInput; diff --git a/core/renderers/geras/measurables/statement_input.js b/core/renderers/geras/measurables/statement_input.js index 51e667695..d4636af3c 100644 --- a/core/renderers/geras/measurables/statement_input.js +++ b/core/renderers/geras/measurables/statement_input.js @@ -17,12 +17,12 @@ */ goog.module('Blockly.geras.StatementInput'); -const BaseStatementInput = goog.require('Blockly.blockRendering.StatementInput'); -/* eslint-disable-next-line no-unused-vars */ -const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); -/* eslint-disable-next-line no-unused-vars */ -const Input = goog.requireType('Blockly.Input'); const object = goog.require('Blockly.utils.object'); +/* eslint-disable-next-line no-unused-vars */ +const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider'); +/* eslint-disable-next-line no-unused-vars */ +const {Input} = goog.requireType('Blockly.Input'); +const {StatementInput: BaseStatementInput} = goog.require('Blockly.blockRendering.StatementInput'); /** @@ -48,4 +48,4 @@ const StatementInput = function(constants, input) { }; object.inherits(StatementInput, BaseStatementInput); -exports = StatementInput; +exports.StatementInput = StatementInput; diff --git a/core/renderers/geras/path_object.js b/core/renderers/geras/path_object.js index 887933a2f..d8497279f 100644 --- a/core/renderers/geras/path_object.js +++ b/core/renderers/geras/path_object.js @@ -16,15 +16,15 @@ */ goog.module('Blockly.geras.PathObject'); -const BasePathObject = goog.require('Blockly.blockRendering.PathObject'); -/* eslint-disable-next-line no-unused-vars */ -const ConstantProvider = goog.requireType('Blockly.geras.ConstantProvider'); -const Svg = goog.require('Blockly.utils.Svg'); -/* eslint-disable-next-line no-unused-vars */ -const Theme = goog.requireType('Blockly.Theme'); const colour = goog.require('Blockly.utils.colour'); const dom = goog.require('Blockly.utils.dom'); const object = goog.require('Blockly.utils.object'); +/* eslint-disable-next-line no-unused-vars */ +const {ConstantProvider} = goog.requireType('Blockly.geras.ConstantProvider'); +const {PathObject: BasePathObject} = goog.require('Blockly.blockRendering.PathObject'); +const {Svg} = goog.require('Blockly.utils.Svg'); +/* eslint-disable-next-line no-unused-vars */ +const {Theme} = goog.requireType('Blockly.Theme'); /** @@ -178,4 +178,4 @@ PathObject.prototype.updateDisabled_ = function(disabled) { } }; -exports = PathObject; +exports.PathObject = PathObject; diff --git a/core/renderers/geras/renderer.js b/core/renderers/geras/renderer.js index 9eef2482c..25629843c 100644 --- a/core/renderers/geras/renderer.js +++ b/core/renderers/geras/renderer.js @@ -15,22 +15,22 @@ */ goog.module('Blockly.geras.Renderer'); -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 BaseConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); -const ConstantProvider = goog.require('Blockly.geras.ConstantProvider'); -const Drawer = goog.require('Blockly.geras.Drawer'); -const HighlightConstantProvider = goog.require('Blockly.geras.HighlightConstantProvider'); -const PathObject = goog.require('Blockly.geras.PathObject'); -const RenderInfo = goog.require('Blockly.geras.RenderInfo'); -/* eslint-disable-next-line no-unused-vars */ -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'); +/* eslint-disable-next-line no-unused-vars */ +const {ConstantProvider: BaseConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider'); +const {ConstantProvider} = goog.require('Blockly.geras.ConstantProvider'); +const {Drawer} = goog.require('Blockly.geras.Drawer'); +const {HighlightConstantProvider} = goog.require('Blockly.geras.HighlightConstantProvider'); +const {PathObject} = goog.require('Blockly.geras.PathObject'); +/* eslint-disable-next-line no-unused-vars */ +const {RenderInfo: BaseRenderInfo} = goog.requireType('Blockly.blockRendering.RenderInfo'); +const {RenderInfo} = goog.require('Blockly.geras.RenderInfo'); +const {Renderer: BaseRenderer} = goog.require('Blockly.blockRendering.Renderer'); +/* eslint-disable-next-line no-unused-vars */ +const {Theme} = goog.requireType('Blockly.Theme'); /** @@ -148,4 +148,4 @@ Renderer.prototype.getHighlightConstants = function() { blockRendering.register('geras', Renderer); -exports = Renderer; +exports.Renderer = Renderer; diff --git a/core/renderers/measurables/base.js b/core/renderers/measurables/base.js index e533538f2..c85f83306 100644 --- a/core/renderers/measurables/base.js +++ b/core/renderers/measurables/base.js @@ -17,8 +17,8 @@ goog.module('Blockly.blockRendering.Measurable'); /* eslint-disable-next-line no-unused-vars */ -const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); -const Types = goog.require('Blockly.blockRendering.Types'); +const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider'); +const {Types} = goog.require('Blockly.blockRendering.Types'); /** @@ -49,4 +49,4 @@ const Measurable = function(constants) { this.notchOffset = this.constants_.NOTCH_OFFSET_LEFT; }; -exports = Measurable; +exports.Measurable = Measurable; diff --git a/core/renderers/measurables/bottom_row.js b/core/renderers/measurables/bottom_row.js index 7df3750db..2103a92ba 100644 --- a/core/renderers/measurables/bottom_row.js +++ b/core/renderers/measurables/bottom_row.js @@ -16,15 +16,15 @@ */ goog.module('Blockly.blockRendering.BottomRow'); -/* eslint-disable-next-line no-unused-vars */ -const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); -/* eslint-disable-next-line no-unused-vars */ -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'); +/* eslint-disable-next-line no-unused-vars */ +const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider'); +/* eslint-disable-next-line no-unused-vars */ +const {NextConnection} = goog.requireType('Blockly.blockRendering.NextConnection'); +const {Row} = goog.require('Blockly.blockRendering.Row'); +const {Types} = goog.require('Blockly.blockRendering.Types'); /** @@ -132,4 +132,4 @@ BottomRow.prototype.endsWithElemSpacer = function() { return false; }; -exports = BottomRow; +exports.BottomRow = BottomRow; diff --git a/core/renderers/measurables/connection.js b/core/renderers/measurables/connection.js index 1b157dc63..fa13ace61 100644 --- a/core/renderers/measurables/connection.js +++ b/core/renderers/measurables/connection.js @@ -16,13 +16,13 @@ */ goog.module('Blockly.blockRendering.Connection'); -/* eslint-disable-next-line no-unused-vars */ -const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); -const Measurable = goog.require('Blockly.blockRendering.Measurable'); -/* eslint-disable-next-line no-unused-vars */ -const RenderedConnection = goog.requireType('Blockly.RenderedConnection'); -const Types = goog.require('Blockly.blockRendering.Types'); const object = goog.require('Blockly.utils.object'); +/* eslint-disable-next-line no-unused-vars */ +const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider'); +const {Measurable} = goog.require('Blockly.blockRendering.Measurable'); +/* eslint-disable-next-line no-unused-vars */ +const {RenderedConnection} = goog.requireType('Blockly.RenderedConnection'); +const {Types} = goog.require('Blockly.blockRendering.Types'); /** @@ -46,4 +46,4 @@ const Connection = function(constants, connectionModel) { }; object.inherits(Connection, Measurable); -exports = Connection; +exports.Connection = Connection; diff --git a/core/renderers/measurables/external_value_input.js b/core/renderers/measurables/external_value_input.js index ba539dc73..8fd8f9f3d 100644 --- a/core/renderers/measurables/external_value_input.js +++ b/core/renderers/measurables/external_value_input.js @@ -16,13 +16,13 @@ */ goog.module('Blockly.blockRendering.ExternalValueInput'); -/* eslint-disable-next-line no-unused-vars */ -const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); -/* eslint-disable-next-line no-unused-vars */ -const Input = goog.requireType('Blockly.Input'); -const InputConnection = goog.require('Blockly.blockRendering.InputConnection'); -const Types = goog.require('Blockly.blockRendering.Types'); const object = goog.require('Blockly.utils.object'); +/* eslint-disable-next-line no-unused-vars */ +const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider'); +const {InputConnection} = goog.require('Blockly.blockRendering.InputConnection'); +/* eslint-disable-next-line no-unused-vars */ +const {Input} = goog.requireType('Blockly.Input'); +const {Types} = goog.require('Blockly.blockRendering.Types'); /** @@ -54,4 +54,4 @@ const ExternalValueInput = function(constants, input) { }; object.inherits(ExternalValueInput, InputConnection); -exports = ExternalValueInput; +exports.ExternalValueInput = ExternalValueInput; diff --git a/core/renderers/measurables/field.js b/core/renderers/measurables/field.js index 1dded6902..52ff1b9a4 100644 --- a/core/renderers/measurables/field.js +++ b/core/renderers/measurables/field.js @@ -16,15 +16,15 @@ */ goog.module('Blockly.blockRendering.Field'); -/* eslint-disable-next-line no-unused-vars */ -const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); -/* eslint-disable-next-line no-unused-vars */ -const BlocklyField = goog.requireType('Blockly.Field'); -/* eslint-disable-next-line no-unused-vars */ -const Input = goog.requireType('Blockly.Input'); -const Measurable = goog.require('Blockly.blockRendering.Measurable'); -const Types = goog.require('Blockly.blockRendering.Types'); const object = goog.require('Blockly.utils.object'); +/* eslint-disable-next-line no-unused-vars */ +const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider'); +/* eslint-disable-next-line no-unused-vars */ +const {Field: BlocklyField} = goog.requireType('Blockly.Field'); +/* eslint-disable-next-line no-unused-vars */ +const {Input} = goog.requireType('Blockly.Input'); +const {Measurable} = goog.require('Blockly.blockRendering.Measurable'); +const {Types} = goog.require('Blockly.blockRendering.Types'); /** @@ -53,4 +53,4 @@ const Field = function(constants, field, parentInput) { }; object.inherits(Field, Measurable); -exports = Field; +exports.Field = Field; diff --git a/core/renderers/measurables/hat.js b/core/renderers/measurables/hat.js index edef26375..b0c2be23d 100644 --- a/core/renderers/measurables/hat.js +++ b/core/renderers/measurables/hat.js @@ -16,11 +16,11 @@ */ goog.module('Blockly.blockRendering.Hat'); -/* eslint-disable-next-line no-unused-vars */ -const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); -const Measurable = goog.require('Blockly.blockRendering.Measurable'); -const Types = goog.require('Blockly.blockRendering.Types'); const object = goog.require('Blockly.utils.object'); +/* eslint-disable-next-line no-unused-vars */ +const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider'); +const {Measurable} = goog.require('Blockly.blockRendering.Measurable'); +const {Types} = goog.require('Blockly.blockRendering.Types'); /** @@ -42,4 +42,4 @@ const Hat = function(constants) { }; object.inherits(Hat, Measurable); -exports = Hat; +exports.Hat = Hat; diff --git a/core/renderers/measurables/icon.js b/core/renderers/measurables/icon.js index e89a8ae72..7b7efb552 100644 --- a/core/renderers/measurables/icon.js +++ b/core/renderers/measurables/icon.js @@ -16,13 +16,13 @@ */ goog.module('Blockly.blockRendering.Icon'); -/* eslint-disable-next-line no-unused-vars */ -const BlocklyIcon = goog.requireType('Blockly.Icon'); -/* eslint-disable-next-line no-unused-vars */ -const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); -const Measurable = goog.require('Blockly.blockRendering.Measurable'); -const Types = goog.require('Blockly.blockRendering.Types'); const object = goog.require('Blockly.utils.object'); +/* eslint-disable-next-line no-unused-vars */ +const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider'); +/* eslint-disable-next-line no-unused-vars */ +const {Icon: BlocklyIcon} = goog.requireType('Blockly.Icon'); +const {Measurable} = goog.require('Blockly.blockRendering.Measurable'); +const {Types} = goog.require('Blockly.blockRendering.Types'); /** @@ -48,4 +48,4 @@ const Icon = function(constants, icon) { }; object.inherits(Icon, Measurable); -exports = Icon; +exports.Icon = Icon; diff --git a/core/renderers/measurables/in_row_spacer.js b/core/renderers/measurables/in_row_spacer.js index 1dc8bb5c8..85e9251e4 100644 --- a/core/renderers/measurables/in_row_spacer.js +++ b/core/renderers/measurables/in_row_spacer.js @@ -16,11 +16,11 @@ */ goog.module('Blockly.blockRendering.InRowSpacer'); -/* eslint-disable-next-line no-unused-vars */ -const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); -const Measurable = goog.require('Blockly.blockRendering.Measurable'); -const Types = goog.require('Blockly.blockRendering.Types'); const object = goog.require('Blockly.utils.object'); +/* eslint-disable-next-line no-unused-vars */ +const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider'); +const {Measurable} = goog.require('Blockly.blockRendering.Measurable'); +const {Types} = goog.require('Blockly.blockRendering.Types'); /** @@ -42,4 +42,4 @@ const InRowSpacer = function(constants, width) { }; object.inherits(InRowSpacer, Measurable); -exports = InRowSpacer; +exports.InRowSpacer = InRowSpacer; diff --git a/core/renderers/measurables/inline_input.js b/core/renderers/measurables/inline_input.js index 42830a052..1389d35a6 100644 --- a/core/renderers/measurables/inline_input.js +++ b/core/renderers/measurables/inline_input.js @@ -16,13 +16,13 @@ */ goog.module('Blockly.blockRendering.InlineInput'); -/* eslint-disable-next-line no-unused-vars */ -const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); -/* eslint-disable-next-line no-unused-vars */ -const Input = goog.requireType('Blockly.Input'); -const InputConnection = goog.require('Blockly.blockRendering.InputConnection'); -const Types = goog.require('Blockly.blockRendering.Types'); const object = goog.require('Blockly.utils.object'); +/* eslint-disable-next-line no-unused-vars */ +const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider'); +const {InputConnection} = goog.require('Blockly.blockRendering.InputConnection'); +/* eslint-disable-next-line no-unused-vars */ +const {Input} = goog.requireType('Blockly.Input'); +const {Types} = goog.require('Blockly.blockRendering.Types'); /** @@ -67,4 +67,4 @@ const InlineInput = function(constants, input) { }; object.inherits(InlineInput, InputConnection); -exports = InlineInput; +exports.InlineInput = InlineInput; diff --git a/core/renderers/measurables/input_connection.js b/core/renderers/measurables/input_connection.js index ab975e171..39a3bfe43 100644 --- a/core/renderers/measurables/input_connection.js +++ b/core/renderers/measurables/input_connection.js @@ -14,13 +14,13 @@ */ goog.module('Blockly.blockRendering.InputConnection'); -const Connection = goog.require('Blockly.blockRendering.Connection'); -/* eslint-disable-next-line no-unused-vars */ -const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); -/* eslint-disable-next-line no-unused-vars */ -const Input = goog.requireType('Blockly.Input'); -const Types = goog.require('Blockly.blockRendering.Types'); const object = goog.require('Blockly.utils.object'); +const {Connection} = goog.require('Blockly.blockRendering.Connection'); +/* eslint-disable-next-line no-unused-vars */ +const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider'); +/* eslint-disable-next-line no-unused-vars */ +const {Input} = goog.requireType('Blockly.Input'); +const {Types} = goog.require('Blockly.blockRendering.Types'); /** @@ -59,4 +59,4 @@ const InputConnection = function(constants, input) { }; object.inherits(InputConnection, Connection); -exports = InputConnection; +exports.InputConnection = InputConnection; diff --git a/core/renderers/measurables/input_row.js b/core/renderers/measurables/input_row.js index 5457f76ec..307b2b384 100644 --- a/core/renderers/measurables/input_row.js +++ b/core/renderers/measurables/input_row.js @@ -16,11 +16,11 @@ */ goog.module('Blockly.blockRendering.InputRow'); -/* eslint-disable-next-line no-unused-vars */ -const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); -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 {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider'); +const {Row} = goog.require('Blockly.blockRendering.Row'); +const {Types} = goog.require('Blockly.blockRendering.Types'); /** @@ -79,4 +79,4 @@ InputRow.prototype.endsWithElemSpacer = function() { return !this.hasExternalInput && !this.hasStatement; }; -exports = InputRow; +exports.InputRow = InputRow; diff --git a/core/renderers/measurables/jagged_edge.js b/core/renderers/measurables/jagged_edge.js index a3bae5748..7c6a2930d 100644 --- a/core/renderers/measurables/jagged_edge.js +++ b/core/renderers/measurables/jagged_edge.js @@ -16,11 +16,11 @@ */ goog.module('Blockly.blockRendering.JaggedEdge'); -/* eslint-disable-next-line no-unused-vars */ -const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); -const Measurable = goog.require('Blockly.blockRendering.Measurable'); -const Types = goog.require('Blockly.blockRendering.Types'); const object = goog.require('Blockly.utils.object'); +/* eslint-disable-next-line no-unused-vars */ +const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider'); +const {Measurable} = goog.require('Blockly.blockRendering.Measurable'); +const {Types} = goog.require('Blockly.blockRendering.Types'); /** @@ -41,4 +41,4 @@ const JaggedEdge = function(constants) { }; object.inherits(JaggedEdge, Measurable); -exports = JaggedEdge; +exports.JaggedEdge = JaggedEdge; diff --git a/core/renderers/measurables/next_connection.js b/core/renderers/measurables/next_connection.js index 9320f4bcf..387f2fb5b 100644 --- a/core/renderers/measurables/next_connection.js +++ b/core/renderers/measurables/next_connection.js @@ -16,13 +16,13 @@ */ goog.module('Blockly.blockRendering.NextConnection'); -const Connection = goog.require('Blockly.blockRendering.Connection'); -/* eslint-disable-next-line no-unused-vars */ -const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); -/* eslint-disable-next-line no-unused-vars */ -const RenderedConnection = goog.requireType('Blockly.RenderedConnection'); -const Types = goog.require('Blockly.blockRendering.Types'); const object = goog.require('Blockly.utils.object'); +const {Connection} = goog.require('Blockly.blockRendering.Connection'); +/* eslint-disable-next-line no-unused-vars */ +const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider'); +/* eslint-disable-next-line no-unused-vars */ +const {RenderedConnection} = goog.requireType('Blockly.RenderedConnection'); +const {Types} = goog.require('Blockly.blockRendering.Types'); /** @@ -45,4 +45,4 @@ const NextConnection = function(constants, connectionModel) { }; object.inherits(NextConnection, Connection); -exports = NextConnection; +exports.NextConnection = NextConnection; diff --git a/core/renderers/measurables/output_connection.js b/core/renderers/measurables/output_connection.js index ce1286177..529a042bf 100644 --- a/core/renderers/measurables/output_connection.js +++ b/core/renderers/measurables/output_connection.js @@ -17,13 +17,13 @@ */ goog.module('Blockly.blockRendering.OutputConnection'); -const Connection = goog.require('Blockly.blockRendering.Connection'); -/* eslint-disable-next-line no-unused-vars */ -const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); -/* eslint-disable-next-line no-unused-vars */ -const RenderedConnection = goog.requireType('Blockly.RenderedConnection'); -const Types = goog.require('Blockly.blockRendering.Types'); const object = goog.require('Blockly.utils.object'); +const {Connection} = goog.require('Blockly.blockRendering.Connection'); +/* eslint-disable-next-line no-unused-vars */ +const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider'); +/* eslint-disable-next-line no-unused-vars */ +const {RenderedConnection} = goog.requireType('Blockly.RenderedConnection'); +const {Types} = goog.require('Blockly.blockRendering.Types'); /** @@ -52,4 +52,4 @@ const OutputConnection = function(constants, connectionModel) { }; object.inherits(OutputConnection, Connection); -exports = OutputConnection; +exports.OutputConnection = OutputConnection; diff --git a/core/renderers/measurables/previous_connection.js b/core/renderers/measurables/previous_connection.js index 2e29244ff..58c2e5081 100644 --- a/core/renderers/measurables/previous_connection.js +++ b/core/renderers/measurables/previous_connection.js @@ -16,13 +16,13 @@ */ goog.module('Blockly.blockRendering.PreviousConnection'); -const Connection = goog.require('Blockly.blockRendering.Connection'); -/* eslint-disable-next-line no-unused-vars */ -const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); -/* eslint-disable-next-line no-unused-vars */ -const RenderedConnection = goog.requireType('Blockly.RenderedConnection'); -const Types = goog.require('Blockly.blockRendering.Types'); const object = goog.require('Blockly.utils.object'); +const {Connection} = goog.require('Blockly.blockRendering.Connection'); +/* eslint-disable-next-line no-unused-vars */ +const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider'); +/* eslint-disable-next-line no-unused-vars */ +const {RenderedConnection} = goog.requireType('Blockly.RenderedConnection'); +const {Types} = goog.require('Blockly.blockRendering.Types'); /** @@ -46,4 +46,4 @@ const PreviousConnection = function(constants, connectionModel) { }; object.inherits(PreviousConnection, Connection); -exports = PreviousConnection; +exports.PreviousConnection = PreviousConnection; diff --git a/core/renderers/measurables/round_corner.js b/core/renderers/measurables/round_corner.js index f3469b887..a68326477 100644 --- a/core/renderers/measurables/round_corner.js +++ b/core/renderers/measurables/round_corner.js @@ -16,11 +16,11 @@ */ goog.module('Blockly.blockRendering.RoundCorner'); -/* eslint-disable-next-line no-unused-vars */ -const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); -const Measurable = goog.require('Blockly.blockRendering.Measurable'); -const Types = goog.require('Blockly.blockRendering.Types'); const object = goog.require('Blockly.utils.object'); +/* eslint-disable-next-line no-unused-vars */ +const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider'); +const {Measurable} = goog.require('Blockly.blockRendering.Measurable'); +const {Types} = goog.require('Blockly.blockRendering.Types'); /** @@ -47,4 +47,4 @@ const RoundCorner = function(constants, opt_position) { }; object.inherits(RoundCorner, Measurable); -exports = RoundCorner; +exports.RoundCorner = RoundCorner; diff --git a/core/renderers/measurables/row.js b/core/renderers/measurables/row.js index 55946bc81..8b82e1aa2 100644 --- a/core/renderers/measurables/row.js +++ b/core/renderers/measurables/row.js @@ -15,14 +15,14 @@ goog.module('Blockly.blockRendering.Row'); /* eslint-disable-next-line no-unused-vars */ -const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); +const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider'); /* eslint-disable-next-line no-unused-vars */ -const InputConnection = goog.requireType('Blockly.blockRendering.InputConnection'); +const {InRowSpacer} = goog.requireType('Blockly.blockRendering.InRowSpacer'); /* eslint-disable-next-line no-unused-vars */ -const InRowSpacer = goog.requireType('Blockly.blockRendering.InRowSpacer'); +const {InputConnection} = goog.requireType('Blockly.blockRendering.InputConnection'); /* eslint-disable-next-line no-unused-vars */ -const Measurable = goog.requireType('Blockly.blockRendering.Measurable'); -const Types = goog.require('Blockly.blockRendering.Types'); +const {Measurable} = goog.requireType('Blockly.blockRendering.Measurable'); +const {Types} = goog.require('Blockly.blockRendering.Types'); /** @@ -228,4 +228,4 @@ Row.prototype.getLastSpacer = function() { return null; }; -exports = Row; +exports.Row = Row; diff --git a/core/renderers/measurables/spacer_row.js b/core/renderers/measurables/spacer_row.js index 24c3624bc..3f0eaa4f4 100644 --- a/core/renderers/measurables/spacer_row.js +++ b/core/renderers/measurables/spacer_row.js @@ -14,12 +14,12 @@ */ goog.module('Blockly.blockRendering.SpacerRow'); -/* eslint-disable-next-line no-unused-vars */ -const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); -const InRowSpacer = goog.require('Blockly.blockRendering.InRowSpacer'); -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 {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider'); +const {InRowSpacer} = goog.require('Blockly.blockRendering.InRowSpacer'); +const {Row} = goog.require('Blockly.blockRendering.Row'); +const {Types} = goog.require('Blockly.blockRendering.Types'); /** @@ -51,4 +51,4 @@ SpacerRow.prototype.measure = function() { // NOP. Width and height were set at creation. }; -exports = SpacerRow; +exports.SpacerRow = SpacerRow; diff --git a/core/renderers/measurables/square_corner.js b/core/renderers/measurables/square_corner.js index cb7f55088..c1b801d5d 100644 --- a/core/renderers/measurables/square_corner.js +++ b/core/renderers/measurables/square_corner.js @@ -16,11 +16,11 @@ */ goog.module('Blockly.blockRendering.SquareCorner'); -/* eslint-disable-next-line no-unused-vars */ -const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); -const Measurable = goog.require('Blockly.blockRendering.Measurable'); -const Types = goog.require('Blockly.blockRendering.Types'); const object = goog.require('Blockly.utils.object'); +/* eslint-disable-next-line no-unused-vars */ +const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider'); +const {Measurable} = goog.require('Blockly.blockRendering.Measurable'); +const {Types} = goog.require('Blockly.blockRendering.Types'); /** @@ -45,4 +45,4 @@ const SquareCorner = function(constants, opt_position) { }; object.inherits(SquareCorner, Measurable); -exports = SquareCorner; +exports.SquareCorner = SquareCorner; diff --git a/core/renderers/measurables/statement_input.js b/core/renderers/measurables/statement_input.js index 60f5a2c91..5a45b9e91 100644 --- a/core/renderers/measurables/statement_input.js +++ b/core/renderers/measurables/statement_input.js @@ -16,13 +16,13 @@ */ goog.module('Blockly.blockRendering.StatementInput'); -/* eslint-disable-next-line no-unused-vars */ -const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); -/* eslint-disable-next-line no-unused-vars */ -const Input = goog.requireType('Blockly.Input'); -const InputConnection = goog.require('Blockly.blockRendering.InputConnection'); -const Types = goog.require('Blockly.blockRendering.Types'); const object = goog.require('Blockly.utils.object'); +/* eslint-disable-next-line no-unused-vars */ +const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider'); +const {InputConnection} = goog.require('Blockly.blockRendering.InputConnection'); +/* eslint-disable-next-line no-unused-vars */ +const {Input} = goog.requireType('Blockly.Input'); +const {Types} = goog.require('Blockly.blockRendering.Types'); /** @@ -53,4 +53,4 @@ const StatementInput = function(constants, input) { }; object.inherits(StatementInput, InputConnection); -exports = StatementInput; +exports.StatementInput = StatementInput; diff --git a/core/renderers/measurables/top_row.js b/core/renderers/measurables/top_row.js index 583df81e0..756abd81d 100644 --- a/core/renderers/measurables/top_row.js +++ b/core/renderers/measurables/top_row.js @@ -14,15 +14,15 @@ */ goog.module('Blockly.blockRendering.TopRow'); -/* eslint-disable-next-line no-unused-vars */ -const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); -/* eslint-disable-next-line no-unused-vars */ -const PreviousConnection = goog.requireType('Blockly.blockRendering.PreviousConnection'); -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'); +/* eslint-disable-next-line no-unused-vars */ +const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider'); +/* eslint-disable-next-line no-unused-vars */ +const {PreviousConnection} = goog.requireType('Blockly.blockRendering.PreviousConnection'); +const {Row} = goog.require('Blockly.blockRendering.Row'); +const {Types} = goog.require('Blockly.blockRendering.Types'); /** @@ -137,4 +137,4 @@ TopRow.prototype.endsWithElemSpacer = function() { return false; }; -exports = TopRow; +exports.TopRow = TopRow; diff --git a/core/renderers/measurables/types.js b/core/renderers/measurables/types.js index 240b1fb73..f717e37f3 100644 --- a/core/renderers/measurables/types.js +++ b/core/renderers/measurables/types.js @@ -17,9 +17,9 @@ goog.module('Blockly.blockRendering.Types'); /* eslint-disable-next-line no-unused-vars */ -const Measurable = goog.requireType('Blockly.blockRendering.Measurable'); +const {Measurable} = goog.requireType('Blockly.blockRendering.Measurable'); /* eslint-disable-next-line no-unused-vars */ -const Row = goog.requireType('Blockly.blockRendering.Row'); +const {Row} = goog.requireType('Blockly.blockRendering.Row'); /** @@ -350,4 +350,4 @@ Types.isInputRow = function(row) { return row.type & Types.INPUT_ROW; }; -exports = Types; +exports.Types = Types; diff --git a/core/renderers/minimalist/constants.js b/core/renderers/minimalist/constants.js index 497f3cb52..eb89ea2ad 100644 --- a/core/renderers/minimalist/constants.js +++ b/core/renderers/minimalist/constants.js @@ -17,8 +17,8 @@ */ goog.module('Blockly.minimalist.ConstantProvider'); -const BaseConstantProvider = goog.require('Blockly.blockRendering.ConstantProvider'); const object = goog.require('Blockly.utils.object'); +const {ConstantProvider: BaseConstantProvider} = goog.require('Blockly.blockRendering.ConstantProvider'); /** @@ -33,4 +33,4 @@ const ConstantProvider = function() { }; object.inherits(ConstantProvider, BaseConstantProvider); -exports = ConstantProvider; +exports.ConstantProvider = ConstantProvider; diff --git a/core/renderers/minimalist/drawer.js b/core/renderers/minimalist/drawer.js index 4ff210bdb..13eb682a1 100644 --- a/core/renderers/minimalist/drawer.js +++ b/core/renderers/minimalist/drawer.js @@ -15,12 +15,12 @@ */ goog.module('Blockly.minimalist.Drawer'); -const BaseDrawer = goog.require('Blockly.blockRendering.Drawer'); -/* 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'); +const {Drawer: BaseDrawer} = goog.require('Blockly.blockRendering.Drawer'); +/* eslint-disable-next-line no-unused-vars */ +const {RenderInfo} = goog.requireType('Blockly.minimalist.RenderInfo'); /** @@ -38,4 +38,4 @@ const Drawer = function(block, info) { }; object.inherits(Drawer, BaseDrawer); -exports = Drawer; +exports.Drawer = Drawer; diff --git a/core/renderers/minimalist/info.js b/core/renderers/minimalist/info.js index 39a74702a..36e66f9e5 100644 --- a/core/renderers/minimalist/info.js +++ b/core/renderers/minimalist/info.js @@ -15,12 +15,12 @@ */ goog.module('Blockly.minimalist.RenderInfo'); -const BaseRenderInfo = goog.require('Blockly.blockRendering.RenderInfo'); -/* 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'); +const {RenderInfo: BaseRenderInfo} = goog.require('Blockly.blockRendering.RenderInfo'); +/* eslint-disable-next-line no-unused-vars */ +const {Renderer} = goog.requireType('Blockly.minimalist.Renderer'); /** @@ -51,4 +51,4 @@ RenderInfo.prototype.getRenderer = function() { return /** @type {!Renderer} */ (this.renderer_); }; -exports = RenderInfo; +exports.RenderInfo = RenderInfo; diff --git a/core/renderers/minimalist/minimalist.js b/core/renderers/minimalist/minimalist.js index 4f1f0124c..a6d27e319 100644 --- a/core/renderers/minimalist/minimalist.js +++ b/core/renderers/minimalist/minimalist.js @@ -15,10 +15,10 @@ */ goog.module('Blockly.minimalist'); -const ConstantProvider = goog.require('Blockly.minimalist.ConstantProvider'); -const Drawer = goog.require('Blockly.minimalist.Drawer'); -const RenderInfo = goog.require('Blockly.minimalist.RenderInfo'); -const Renderer = goog.require('Blockly.minimalist.Renderer'); +const {ConstantProvider} = goog.require('Blockly.minimalist.ConstantProvider'); +const {Drawer} = goog.require('Blockly.minimalist.Drawer'); +const {RenderInfo} = goog.require('Blockly.minimalist.RenderInfo'); +const {Renderer} = goog.require('Blockly.minimalist.Renderer'); exports.ConstantProvider = ConstantProvider; exports.Drawer = Drawer; diff --git a/core/renderers/minimalist/renderer.js b/core/renderers/minimalist/renderer.js index 22f9a00c4..6cc7c9e2f 100644 --- a/core/renderers/minimalist/renderer.js +++ b/core/renderers/minimalist/renderer.js @@ -15,16 +15,16 @@ */ goog.module('Blockly.minimalist.Renderer'); -/* eslint-disable-next-line no-unused-vars */ -const BaseRenderInfo = goog.requireType('Blockly.blockRendering.RenderInfo'); -const BaseRenderer = goog.require('Blockly.blockRendering.Renderer'); -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'); +const {ConstantProvider} = goog.require('Blockly.minimalist.ConstantProvider'); +const {Drawer} = goog.require('Blockly.minimalist.Drawer'); +/* eslint-disable-next-line no-unused-vars */ +const {RenderInfo: BaseRenderInfo} = goog.requireType('Blockly.blockRendering.RenderInfo'); +const {RenderInfo} = goog.require('Blockly.minimalist.RenderInfo'); +const {Renderer: BaseRenderer} = goog.require('Blockly.blockRendering.Renderer'); /** @@ -76,4 +76,4 @@ Renderer.prototype.makeDrawer_ = function(block, info) { blockRendering.register('minimalist', Renderer); -exports = Renderer; +exports.Renderer = Renderer; diff --git a/core/renderers/thrasos/info.js b/core/renderers/thrasos/info.js index a857e72e9..a8cb2bfed 100644 --- a/core/renderers/thrasos/info.js +++ b/core/renderers/thrasos/info.js @@ -17,16 +17,16 @@ */ goog.module('Blockly.thrasos.RenderInfo'); -const BaseRenderInfo = goog.require('Blockly.blockRendering.RenderInfo'); -/* 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'); +/* eslint-disable-next-line no-unused-vars */ +const {Field} = goog.requireType('Blockly.blockRendering.Field'); +const {InRowSpacer} = goog.require('Blockly.blockRendering.InRowSpacer'); +const {RenderInfo: BaseRenderInfo} = goog.require('Blockly.blockRendering.RenderInfo'); +/* eslint-disable-next-line no-unused-vars */ +const {Renderer} = goog.requireType('Blockly.thrasos.Renderer'); +const {Types} = goog.require('Blockly.blockRendering.Types'); /** @@ -326,4 +326,4 @@ RenderInfo.prototype.finalize_ = function() { this.startY = this.topRow.capline; }; -exports = RenderInfo; +exports.RenderInfo = RenderInfo; diff --git a/core/renderers/thrasos/renderer.js b/core/renderers/thrasos/renderer.js index 73520ed26..b192c3145 100644 --- a/core/renderers/thrasos/renderer.js +++ b/core/renderers/thrasos/renderer.js @@ -15,12 +15,12 @@ */ goog.module('Blockly.thrasos.Renderer'); -const BaseRenderer = goog.require('Blockly.blockRendering.Renderer'); -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'); +const {RenderInfo} = goog.require('Blockly.thrasos.RenderInfo'); +const {Renderer: BaseRenderer} = goog.require('Blockly.blockRendering.Renderer'); /** @@ -50,4 +50,4 @@ Renderer.prototype.makeRenderInfo_ = function(block) { blockRendering.register('thrasos', Renderer); -exports = Renderer; +exports.Renderer = Renderer; diff --git a/core/renderers/thrasos/thrasos.js b/core/renderers/thrasos/thrasos.js index 9bf5e0c60..0b1923a6a 100644 --- a/core/renderers/thrasos/thrasos.js +++ b/core/renderers/thrasos/thrasos.js @@ -15,8 +15,8 @@ */ goog.module('Blockly.thrasos'); -const RenderInfo = goog.require('Blockly.thrasos.RenderInfo'); -const Renderer = goog.require('Blockly.thrasos.Renderer'); +const {RenderInfo} = goog.require('Blockly.thrasos.RenderInfo'); +const {Renderer} = goog.require('Blockly.thrasos.Renderer'); exports.RenderInfo = RenderInfo; exports.Renderer = Renderer; diff --git a/core/renderers/zelos/constants.js b/core/renderers/zelos/constants.js index 6abefe166..8825f4806 100644 --- a/core/renderers/zelos/constants.js +++ b/core/renderers/zelos/constants.js @@ -17,13 +17,13 @@ */ goog.module('Blockly.zelos.ConstantProvider'); -const BaseConstantProvider = goog.require('Blockly.blockRendering.ConstantProvider'); -const Svg = goog.require('Blockly.utils.Svg'); const dom = goog.require('Blockly.utils.dom'); const object = goog.require('Blockly.utils.object'); const svgPaths = goog.require('Blockly.utils.svgPaths'); const utilsColour = goog.require('Blockly.utils.colour'); const {ConnectionType} = goog.require('Blockly.ConnectionType'); +const {ConstantProvider: BaseConstantProvider} = goog.require('Blockly.blockRendering.ConstantProvider'); +const {Svg} = goog.require('Blockly.utils.Svg'); /** @@ -946,4 +946,4 @@ ConstantProvider.prototype.getCSS_ = function(selector) { ]; }; -exports = ConstantProvider; +exports.ConstantProvider = ConstantProvider; diff --git a/core/renderers/zelos/drawer.js b/core/renderers/zelos/drawer.js index 542213583..fc3dfbbaf 100644 --- a/core/renderers/zelos/drawer.js +++ b/core/renderers/zelos/drawer.js @@ -15,18 +15,18 @@ */ goog.module('Blockly.zelos.Drawer'); -const BaseDrawer = goog.require('Blockly.blockRendering.Drawer'); -/* 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'); -/* eslint-disable-next-line no-unused-vars */ -const Row = goog.requireType('Blockly.blockRendering.Row'); const debug = goog.require('Blockly.blockRendering.debug'); 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'); +const {Drawer: BaseDrawer} = goog.require('Blockly.blockRendering.Drawer'); +/* 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'); +/* eslint-disable-next-line no-unused-vars */ +const {Row} = goog.requireType('Blockly.blockRendering.Row'); /** @@ -230,4 +230,4 @@ Drawer.prototype.drawStatementInput_ = function(row) { this.positionStatementInputConnection_(row); }; -exports = Drawer; +exports.Drawer = Drawer; diff --git a/core/renderers/zelos/info.js b/core/renderers/zelos/info.js index bdfafe0b4..966f4eaff 100644 --- a/core/renderers/zelos/info.js +++ b/core/renderers/zelos/info.js @@ -16,27 +16,27 @@ */ goog.module('Blockly.zelos.RenderInfo'); -const BaseRenderInfo = goog.require('Blockly.blockRendering.RenderInfo'); -const BottomRow = goog.require('Blockly.zelos.BottomRow'); -/* eslint-disable-next-line no-unused-vars */ -const ConstantProvider = goog.requireType('Blockly.zelos.ConstantProvider'); -const FieldImage = goog.require('Blockly.FieldImage'); -const FieldLabel = goog.require('Blockly.FieldLabel'); -const FieldTextInput = goog.require('Blockly.FieldTextInput'); -const InRowSpacer = goog.require('Blockly.blockRendering.InRowSpacer'); -/* eslint-disable-next-line no-unused-vars */ -const Measurable = goog.requireType('Blockly.blockRendering.Measurable'); -/* eslint-disable-next-line no-unused-vars */ -const Renderer = goog.requireType('Blockly.zelos.Renderer'); -const RightConnectionShape = goog.require('Blockly.zelos.RightConnectionShape'); -const StatementInput = goog.require('Blockly.zelos.StatementInput'); -const TopRow = goog.require('Blockly.zelos.TopRow'); -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'); +const {BottomRow} = goog.require('Blockly.zelos.BottomRow'); +/* eslint-disable-next-line no-unused-vars */ +const {ConstantProvider} = goog.requireType('Blockly.zelos.ConstantProvider'); +const {FieldImage} = goog.require('Blockly.FieldImage'); +const {FieldLabel} = goog.require('Blockly.FieldLabel'); +const {FieldTextInput} = goog.require('Blockly.FieldTextInput'); +const {InRowSpacer} = goog.require('Blockly.blockRendering.InRowSpacer'); +/* eslint-disable-next-line no-unused-vars */ +const {Measurable} = goog.requireType('Blockly.blockRendering.Measurable'); +const {RenderInfo: BaseRenderInfo} = goog.require('Blockly.blockRendering.RenderInfo'); +/* eslint-disable-next-line no-unused-vars */ +const {Renderer} = goog.requireType('Blockly.zelos.Renderer'); +const {RightConnectionShape} = goog.require('Blockly.zelos.RightConnectionShape'); +const {StatementInput} = goog.require('Blockly.zelos.StatementInput'); +const {TopRow} = goog.require('Blockly.zelos.TopRow'); +const {Types} = goog.require('Blockly.blockRendering.Types'); +const {inputTypes} = goog.require('Blockly.inputTypes'); /** @@ -599,4 +599,4 @@ RenderInfo.prototype.finalize_ = function() { } }; -exports = RenderInfo; +exports.RenderInfo = RenderInfo; diff --git a/core/renderers/zelos/marker_svg.js b/core/renderers/zelos/marker_svg.js index 7ec57c8d1..d4ec1ea6e 100644 --- a/core/renderers/zelos/marker_svg.js +++ b/core/renderers/zelos/marker_svg.js @@ -15,14 +15,6 @@ */ goog.module('Blockly.zelos.MarkerSvg'); -const BaseMarkerSvg = goog.require('Blockly.blockRendering.MarkerSvg'); -/* 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'); -const Svg = goog.require('Blockly.utils.Svg'); -/* eslint-disable-next-line no-unused-vars */ -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 */ @@ -30,7 +22,15 @@ const {ASTNode} = goog.requireType('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'); +const {MarkerSvg: BaseMarkerSvg} = goog.require('Blockly.blockRendering.MarkerSvg'); +/* eslint-disable-next-line no-unused-vars */ const {Marker} = goog.requireType('Blockly.Marker'); +const {Svg} = goog.require('Blockly.utils.Svg'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg'); /** @@ -162,4 +162,4 @@ MarkerSvg.prototype.applyColour_ = function(curNode) { } }; -exports = MarkerSvg; +exports.MarkerSvg = MarkerSvg; diff --git a/core/renderers/zelos/measurables/bottom_row.js b/core/renderers/zelos/measurables/bottom_row.js index 1e8bf4b44..2a6045f64 100644 --- a/core/renderers/zelos/measurables/bottom_row.js +++ b/core/renderers/zelos/measurables/bottom_row.js @@ -15,10 +15,10 @@ */ goog.module('Blockly.zelos.BottomRow'); -const BaseBottomRow = goog.require('Blockly.blockRendering.BottomRow'); -/* eslint-disable-next-line no-unused-vars */ -const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); const object = goog.require('Blockly.utils.object'); +const {BottomRow: BaseBottomRow} = goog.require('Blockly.blockRendering.BottomRow'); +/* eslint-disable-next-line no-unused-vars */ +const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider'); /** @@ -62,4 +62,4 @@ BottomRow.prototype.hasRightSquareCorner = function(block) { !block.nextConnection; }; -exports = BottomRow; +exports.BottomRow = BottomRow; diff --git a/core/renderers/zelos/measurables/inputs.js b/core/renderers/zelos/measurables/inputs.js index 8a10d19f7..ada8cdea3 100644 --- a/core/renderers/zelos/measurables/inputs.js +++ b/core/renderers/zelos/measurables/inputs.js @@ -16,12 +16,12 @@ */ goog.module('Blockly.zelos.StatementInput'); -const BaseStatementInput = goog.require('Blockly.blockRendering.StatementInput'); -/* eslint-disable-next-line no-unused-vars */ -const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); -/* eslint-disable-next-line no-unused-vars */ -const Input = goog.requireType('Blockly.Input'); const object = goog.require('Blockly.utils.object'); +/* eslint-disable-next-line no-unused-vars */ +const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider'); +/* eslint-disable-next-line no-unused-vars */ +const {Input} = goog.requireType('Blockly.Input'); +const {StatementInput: BaseStatementInput} = goog.require('Blockly.blockRendering.StatementInput'); /** @@ -53,4 +53,4 @@ const StatementInput = function(constants, input) { }; object.inherits(StatementInput, BaseStatementInput); -exports = StatementInput; +exports.StatementInput = StatementInput; diff --git a/core/renderers/zelos/measurables/row_elements.js b/core/renderers/zelos/measurables/row_elements.js index af7ad994c..d0634f3dd 100644 --- a/core/renderers/zelos/measurables/row_elements.js +++ b/core/renderers/zelos/measurables/row_elements.js @@ -16,11 +16,11 @@ */ goog.module('Blockly.zelos.RightConnectionShape'); -/* eslint-disable-next-line no-unused-vars */ -const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); -const Measurable = goog.require('Blockly.blockRendering.Measurable'); -const Types = goog.require('Blockly.blockRendering.Types'); const object = goog.require('Blockly.utils.object'); +/* eslint-disable-next-line no-unused-vars */ +const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider'); +const {Measurable} = goog.require('Blockly.blockRendering.Measurable'); +const {Types} = goog.require('Blockly.blockRendering.Types'); /** @@ -42,4 +42,4 @@ const RightConnectionShape = function(constants) { }; object.inherits(RightConnectionShape, Measurable); -exports = RightConnectionShape; +exports.RightConnectionShape = RightConnectionShape; diff --git a/core/renderers/zelos/measurables/top_row.js b/core/renderers/zelos/measurables/top_row.js index 0f1b6ddf5..50df37d96 100644 --- a/core/renderers/zelos/measurables/top_row.js +++ b/core/renderers/zelos/measurables/top_row.js @@ -15,10 +15,10 @@ */ goog.module('Blockly.zelos.TopRow'); -const BaseTopRow = goog.require('Blockly.blockRendering.TopRow'); -/* eslint-disable-next-line no-unused-vars */ -const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider'); const object = goog.require('Blockly.utils.object'); +/* eslint-disable-next-line no-unused-vars */ +const {ConstantProvider} = goog.requireType('Blockly.blockRendering.ConstantProvider'); +const {TopRow: BaseTopRow} = goog.require('Blockly.blockRendering.TopRow'); /** @@ -67,4 +67,4 @@ TopRow.prototype.hasRightSquareCorner = function(block) { !block.nextConnection; }; -exports = TopRow; +exports.TopRow = TopRow; diff --git a/core/renderers/zelos/path_object.js b/core/renderers/zelos/path_object.js index 6fc4663bb..45ab7be82 100644 --- a/core/renderers/zelos/path_object.js +++ b/core/renderers/zelos/path_object.js @@ -16,14 +16,14 @@ */ goog.module('Blockly.zelos.PathObject'); -const BasePathObject = goog.require('Blockly.blockRendering.PathObject'); -/* eslint-disable-next-line no-unused-vars */ -const ConstantProvider = goog.requireType('Blockly.zelos.ConstantProvider'); -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'); const object = goog.require('Blockly.utils.object'); +/* eslint-disable-next-line no-unused-vars */ +const {ConstantProvider} = goog.requireType('Blockly.zelos.ConstantProvider'); +const {PathObject: BasePathObject} = goog.require('Blockly.blockRendering.PathObject'); +const {Svg} = goog.require('Blockly.utils.Svg'); +/* eslint-disable-next-line no-unused-vars */ +const {Theme} = goog.requireType('Blockly.Theme'); /** @@ -243,4 +243,4 @@ PathObject.prototype.removeOutlinePath_ = function(name) { delete this.outlines_[name]; }; -exports = PathObject; +exports.PathObject = PathObject; diff --git a/core/renderers/zelos/renderer.js b/core/renderers/zelos/renderer.js index ca85f6985..62d7a27f2 100644 --- a/core/renderers/zelos/renderer.js +++ b/core/renderers/zelos/renderer.js @@ -15,26 +15,26 @@ */ goog.module('Blockly.zelos.Renderer'); -const BaseRenderer = goog.require('Blockly.blockRendering.Renderer'); -/* eslint-disable-next-line no-unused-vars */ -const BaseRenderInfo = goog.requireType('Blockly.blockRendering.RenderInfo'); -const ConstantProvider = goog.require('Blockly.zelos.ConstantProvider'); -const Drawer = goog.require('Blockly.zelos.Drawer'); -const InsertionMarkerManager = goog.require('Blockly.InsertionMarkerManager'); -const MarkerSvg = goog.require('Blockly.zelos.MarkerSvg'); -const PathObject = goog.require('Blockly.zelos.PathObject'); -const RenderInfo = goog.require('Blockly.zelos.RenderInfo'); -/* eslint-disable-next-line no-unused-vars */ -const Theme = goog.requireType('Blockly.Theme'); -/* eslint-disable-next-line no-unused-vars */ -const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); 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'); const {ConnectionType} = goog.require('Blockly.ConnectionType'); +const {ConstantProvider} = goog.require('Blockly.zelos.ConstantProvider'); +const {Drawer} = goog.require('Blockly.zelos.Drawer'); +const {InsertionMarkerManager} = goog.require('Blockly.InsertionMarkerManager'); +const {MarkerSvg} = goog.require('Blockly.zelos.MarkerSvg'); /* eslint-disable-next-line no-unused-vars */ const {Marker} = goog.requireType('Blockly.Marker'); +const {PathObject} = goog.require('Blockly.zelos.PathObject'); +/* eslint-disable-next-line no-unused-vars */ +const {RenderInfo: BaseRenderInfo} = goog.requireType('Blockly.blockRendering.RenderInfo'); +const {RenderInfo} = goog.require('Blockly.zelos.RenderInfo'); +const {Renderer: BaseRenderer} = goog.require('Blockly.blockRendering.Renderer'); +/* eslint-disable-next-line no-unused-vars */ +const {Theme} = goog.requireType('Blockly.Theme'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg'); /** @@ -145,4 +145,4 @@ Renderer.prototype.getConnectionPreviewMethod = function( blockRendering.register('zelos', Renderer); -exports = Renderer; +exports.Renderer = Renderer; diff --git a/core/renderers/zelos/zelos.js b/core/renderers/zelos/zelos.js index b06a07e91..55982a3ee 100644 --- a/core/renderers/zelos/zelos.js +++ b/core/renderers/zelos/zelos.js @@ -15,16 +15,16 @@ */ goog.module('Blockly.zelos'); -const BottomRow = goog.require('Blockly.zelos.BottomRow'); -const ConstantProvider = goog.require('Blockly.zelos.ConstantProvider'); -const Drawer = goog.require('Blockly.zelos.Drawer'); -const MarkerSvg = goog.require('Blockly.zelos.MarkerSvg'); -const PathObject = goog.require('Blockly.zelos.PathObject'); -const RenderInfo = goog.require('Blockly.zelos.RenderInfo'); -const Renderer = goog.require('Blockly.zelos.Renderer'); -const RightConnectionShape = goog.require('Blockly.zelos.RightConnectionShape'); -const StatementInput = goog.require('Blockly.zelos.StatementInput'); -const TopRow = goog.require('Blockly.zelos.TopRow'); +const {BottomRow} = goog.require('Blockly.zelos.BottomRow'); +const {ConstantProvider} = goog.require('Blockly.zelos.ConstantProvider'); +const {Drawer} = goog.require('Blockly.zelos.Drawer'); +const {MarkerSvg} = goog.require('Blockly.zelos.MarkerSvg'); +const {PathObject} = goog.require('Blockly.zelos.PathObject'); +const {RenderInfo} = goog.require('Blockly.zelos.RenderInfo'); +const {Renderer} = goog.require('Blockly.zelos.Renderer'); +const {RightConnectionShape} = goog.require('Blockly.zelos.RightConnectionShape'); +const {StatementInput} = goog.require('Blockly.zelos.StatementInput'); +const {TopRow} = goog.require('Blockly.zelos.TopRow'); exports.BottomRow = BottomRow; exports.ConstantProvider = ConstantProvider; diff --git a/core/requires.js b/core/requires.js index dc1a378c3..5fe22ee70 100644 --- a/core/requires.js +++ b/core/requires.js @@ -15,15 +15,22 @@ goog.provide('Blockly.requires'); // Blockly Core (absolutely mandatory). goog.require('Blockly'); - - // If block comments aren't required, then Blockly.inject's "comments" // configuration must be false, and no blocks may be loaded from XML which // define comments. goog.require('Blockly.Comment'); -// One of these two will almost certainly be needed (usually VerticalFlyout). -goog.require('Blockly.HorizontalFlyout'); -goog.require('Blockly.VerticalFlyout'); +// This registers default contextmenu options. +goog.require('Blockly.ContextMenuItems'); +goog.require('Blockly.FieldAngle'); +goog.require('Blockly.FieldCheckbox'); +goog.require('Blockly.FieldColour'); +goog.require('Blockly.FieldDropdown'); +goog.require('Blockly.FieldImage'); +goog.require('Blockly.FieldLabelSerializable'); +goog.require('Blockly.FieldMultilineInput'); +goog.require('Blockly.FieldNumber'); +goog.require('Blockly.FieldTextInput'); +goog.require('Blockly.FieldVariable'); // Flyout buttons are needed by the variable category, // and by any custom toolbox that has a button or a label. goog.require('Blockly.FlyoutButton'); @@ -31,6 +38,21 @@ goog.require('Blockly.FlyoutButton'); // Should not be required when using advanced compilation since // individual generator files should already have this require. goog.require('Blockly.Generator'); +// One of these two will almost certainly be needed (usually VerticalFlyout). +goog.require('Blockly.HorizontalFlyout'); +// Block dependencies. +// None of these should be required when using advanced compilation since +// individual block files should include the requirements they depend on. +goog.require('Blockly.Mutator'); +// This registers default keyboard shortcuts. +goog.require('Blockly.ShortcutItems'); +// The debug renderer, which shows simplified versions of the blocks for +// developer use. +// goog.require('Blockly.blockRendering.Debug'); + +// Blockly Themes. +// Classic is the default theme. +goog.require('Blockly.Themes.Classic'); // If the toolbox does not have categories and only has a simple flyout, then // 'Blockly.Toolbox' is not needed. goog.require('Blockly.Toolbox'); @@ -39,49 +61,20 @@ goog.require('Blockly.Toolbox'); goog.require('Blockly.Trashcan'); // Only needed if one is using the 'VARIABLE_DYNAMIC' typed variables category. goog.require('Blockly.VariablesDynamic'); +goog.require('Blockly.VerticalFlyout'); +goog.require('Blockly.Warning'); // Only need to require these two if you're using workspace comments. // goog.require('Blockly.WorkspaceCommentSvg'); // If zoom controls aren't required, then Blockly.inject's // "zoom"/"controls" configuration must be false. goog.require('Blockly.ZoomControls'); -// This registers default keyboard shortcuts. -goog.require('Blockly.ShortcutItems'); -// This registers default contextmenu options. -goog.require('Blockly.ContextMenuItems'); - - -// Block dependencies. -// None of these should be required when using advanced compilation since -// individual block files should include the requirements they depend on. -goog.require('Blockly.Mutator'); -goog.require('Blockly.Warning'); -goog.require('Blockly.FieldAngle'); -goog.require('Blockly.FieldCheckbox'); -goog.require('Blockly.FieldColour'); -goog.require('Blockly.FieldDropdown'); -goog.require('Blockly.FieldLabelSerializable'); -goog.require('Blockly.FieldImage'); -goog.require('Blockly.FieldTextInput'); -goog.require('Blockly.FieldMultilineInput'); -goog.require('Blockly.FieldNumber'); -goog.require('Blockly.FieldVariable'); - - // Blockly Renderers. // At least one renderer is mandatory. Geras is the default one. // Others may be chosen using Blockly.inject's "renderer" configuration. goog.require('Blockly.geras.Renderer'); -goog.require('Blockly.thrasos.Renderer'); -goog.require('Blockly.zelos.Renderer'); -// The debug renderer, which shows simplified versions of the blocks for -// developer use. -// goog.require('Blockly.blockRendering.Debug'); - -// Blockly Themes. -// Classic is the default theme. -goog.require('Blockly.Themes.Classic'); - goog.require('Blockly.serialization.blocks'); goog.require('Blockly.serialization.registry'); goog.require('Blockly.serialization.variables'); goog.require('Blockly.serialization.workspaces'); +goog.require('Blockly.thrasos.Renderer'); +goog.require('Blockly.zelos.Renderer'); diff --git a/core/scrollbar.js b/core/scrollbar.js index 94078177b..901486967 100644 --- a/core/scrollbar.js +++ b/core/scrollbar.js @@ -16,15 +16,15 @@ goog.module('Blockly.Scrollbar'); const Touch = goog.require('Blockly.Touch'); -const Coordinate = goog.require('Blockly.utils.Coordinate'); -/* eslint-disable-next-line no-unused-vars */ -const Metrics = goog.requireType('Blockly.utils.Metrics'); -const Svg = goog.require('Blockly.utils.Svg'); -/* eslint-disable-next-line no-unused-vars */ -const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); const browserEvents = goog.require('Blockly.browserEvents'); const dom = goog.require('Blockly.utils.dom'); const utils = goog.require('Blockly.utils'); +const {Coordinate} = goog.require('Blockly.utils.Coordinate'); +/* eslint-disable-next-line no-unused-vars */ +const {Metrics} = goog.requireType('Blockly.utils.Metrics'); +const {Svg} = goog.require('Blockly.utils.Svg'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg'); /** @@ -842,4 +842,4 @@ Scrollbar.prototype.setOrigin = function(x, y) { this.origin_ = new Coordinate(x, y); }; -exports = Scrollbar; +exports.Scrollbar = Scrollbar; diff --git a/core/scrollbar_pair.js b/core/scrollbar_pair.js index f0339607e..e69704a49 100644 --- a/core/scrollbar_pair.js +++ b/core/scrollbar_pair.js @@ -15,14 +15,14 @@ */ goog.module('Blockly.ScrollbarPair'); -/* eslint-disable-next-line no-unused-vars */ -const Metrics = goog.requireType('Blockly.utils.Metrics'); -const Scrollbar = goog.require('Blockly.Scrollbar'); -const Svg = goog.require('Blockly.utils.Svg'); -/* eslint-disable-next-line no-unused-vars */ -const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); const dom = goog.require('Blockly.utils.dom'); const eventUtils = goog.require('Blockly.Events.utils'); +/* eslint-disable-next-line no-unused-vars */ +const {Metrics} = goog.requireType('Blockly.utils.Metrics'); +const {Scrollbar} = goog.require('Blockly.Scrollbar'); +const {Svg} = goog.require('Blockly.utils.Svg'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg'); /** @@ -321,4 +321,4 @@ ScrollbarPair.prototype.resizeView = function(hostMetrics) { } }; -exports = ScrollbarPair; +exports.ScrollbarPair = ScrollbarPair; diff --git a/core/serialization/blocks.js b/core/serialization/blocks.js index 43ebee692..d5a8a4cfa 100644 --- a/core/serialization/blocks.js +++ b/core/serialization/blocks.js @@ -17,21 +17,21 @@ goog.module('Blockly.serialization.blocks'); goog.module.declareLegacyNamespace(); -const {BadConnectionCheck, MissingBlockType, MissingConnection, RealChildOfShadow} = goog.require('Blockly.serialization.exceptions'); -// eslint-disable-next-line no-unused-vars -const Connection = goog.requireType('Blockly.Connection'); -// eslint-disable-next-line no-unused-vars -const {ISerializer} = goog.require('Blockly.serialization.ISerializer'); -const Size = goog.require('Blockly.utils.Size'); -// eslint-disable-next-line no-unused-vars -const Workspace = goog.requireType('Blockly.Workspace'); const Xml = goog.require('Blockly.Xml'); const eventUtils = goog.require('Blockly.Events.utils'); -const inputTypes = goog.require('Blockly.inputTypes'); const priorities = goog.require('Blockly.serialization.priorities'); const serializationRegistry = goog.require('Blockly.serialization.registry'); +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'); +// eslint-disable-next-line no-unused-vars +const {ISerializer} = goog.require('Blockly.serialization.ISerializer'); +const {Size} = goog.require('Blockly.utils.Size'); +// eslint-disable-next-line no-unused-vars +const {Workspace} = goog.requireType('Blockly.Workspace'); +const {inputTypes} = goog.require('Blockly.inputTypes'); // TODO(#5160): Remove this once lint is fixed. diff --git a/core/serialization/exceptions.js b/core/serialization/exceptions.js index 1e1129f0a..bd1792665 100644 --- a/core/serialization/exceptions.js +++ b/core/serialization/exceptions.js @@ -17,10 +17,10 @@ goog.module('Blockly.serialization.exceptions'); goog.module.declareLegacyNamespace(); -// 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'); +// eslint-disable-next-line no-unused-vars +const {State} = goog.requireType('Blockly.serialization.blocks'); /** * @alias Blockly.serialization.exceptions.DeserializationError diff --git a/core/serialization/registry.js b/core/serialization/registry.js index 671236fb0..4d51494ac 100644 --- a/core/serialization/registry.js +++ b/core/serialization/registry.js @@ -19,9 +19,9 @@ goog.module('Blockly.serialization.registry'); goog.module.declareLegacyNamespace(); +const registry = goog.require('Blockly.registry'); // eslint-disable-next-line no-unused-vars const {ISerializer} = goog.requireType('Blockly.serialization.ISerializer'); -const registry = goog.require('Blockly.registry'); /** diff --git a/core/serialization/variables.js b/core/serialization/variables.js index 7a809be45..346387787 100644 --- a/core/serialization/variables.js +++ b/core/serialization/variables.js @@ -18,12 +18,12 @@ goog.module('Blockly.serialization.variables'); goog.module.declareLegacyNamespace(); +const priorities = goog.require('Blockly.serialization.priorities'); +const serializationRegistry = goog.require('Blockly.serialization.registry'); // eslint-disable-next-line no-unused-vars const {ISerializer} = goog.require('Blockly.serialization.ISerializer'); // eslint-disable-next-line no-unused-vars -const Workspace = goog.requireType('Blockly.Workspace'); -const priorities = goog.require('Blockly.serialization.priorities'); -const serializationRegistry = goog.require('Blockly.serialization.registry'); +const {Workspace} = goog.requireType('Blockly.Workspace'); /** diff --git a/core/serialization/workspaces.js b/core/serialization/workspaces.js index be9772563..3ecb3b387 100644 --- a/core/serialization/workspaces.js +++ b/core/serialization/workspaces.js @@ -18,11 +18,11 @@ goog.module('Blockly.serialization.workspaces'); goog.module.declareLegacyNamespace(); -// eslint-disable-next-line no-unused-vars -const Workspace = goog.require('Blockly.Workspace'); const dom = goog.require('Blockly.utils.dom'); const eventUtils = goog.require('Blockly.Events.utils'); const registry = goog.require('Blockly.registry'); +// eslint-disable-next-line no-unused-vars +const {Workspace} = goog.require('Blockly.Workspace'); /** diff --git a/core/shortcut_items.js b/core/shortcut_items.js index 232298fc6..b68ed18f5 100644 --- a/core/shortcut_items.js +++ b/core/shortcut_items.js @@ -15,15 +15,15 @@ */ goog.module('Blockly.ShortcutItems'); -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'); const common = goog.require('Blockly.common'); /* 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'); /** diff --git a/core/shortcut_registry.js b/core/shortcut_registry.js index a9037c63a..0f84684f0 100644 --- a/core/shortcut_registry.js +++ b/core/shortcut_registry.js @@ -17,10 +17,10 @@ */ goog.module('Blockly.ShortcutRegistry'); -const KeyCodes = goog.require('Blockly.utils.KeyCodes'); -/* eslint-disable-next-line no-unused-vars */ -const Workspace = goog.requireType('Blockly.Workspace'); const object = goog.require('Blockly.utils.object'); +const {KeyCodes} = goog.require('Blockly.utils.KeyCodes'); +/* eslint-disable-next-line no-unused-vars */ +const {Workspace} = goog.requireType('Blockly.Workspace'); /** @@ -354,4 +354,4 @@ ShortcutRegistry.prototype.createSerializedKey = function(keyCode, modifiers) { // Creates and assigns the singleton instance. new ShortcutRegistry(); -exports = ShortcutRegistry; +exports.ShortcutRegistry = ShortcutRegistry; diff --git a/core/theme.js b/core/theme.js index ec5f036d4..fb78bde30 100644 --- a/core/theme.js +++ b/core/theme.js @@ -231,4 +231,4 @@ Theme.defineTheme = function(name, themeObj) { return theme; }; -exports = Theme; +exports.Theme = Theme; diff --git a/core/theme/classic.js b/core/theme/classic.js index e4ab93e85..f0cb239e0 100644 --- a/core/theme/classic.js +++ b/core/theme/classic.js @@ -17,7 +17,7 @@ */ goog.module('Blockly.Themes.Classic'); -const Theme = goog.require('Blockly.Theme'); +const {Theme} = goog.require('Blockly.Theme'); let defaultBlockStyles = { @@ -54,4 +54,4 @@ let categoryStyles = { const Classic = new Theme('classic', defaultBlockStyles, categoryStyles); -exports = Classic; +exports.Classic = Classic; diff --git a/core/theme/themes.js b/core/theme/themes.js index e6cac55be..11b11d9a7 100644 --- a/core/theme/themes.js +++ b/core/theme/themes.js @@ -15,8 +15,8 @@ */ goog.module('Blockly.Themes'); -const Classic = goog.require('Blockly.Themes.Classic'); -const Zelos = goog.require('Blockly.Themes.Zelos'); +const {Classic} = goog.require('Blockly.Themes.Classic'); +const {Zelos} = goog.require('Blockly.Themes.Zelos'); exports.Classic = Classic; diff --git a/core/theme/zelos.js b/core/theme/zelos.js index edd321c0a..28154916e 100644 --- a/core/theme/zelos.js +++ b/core/theme/zelos.js @@ -15,7 +15,7 @@ */ goog.module('Blockly.Themes.Zelos'); -const Theme = goog.require('Blockly.Theme'); +const {Theme} = goog.require('Blockly.Theme'); let defaultBlockStyles = { @@ -91,4 +91,4 @@ let categoryStyles = { */ const Zelos = new Theme('zelos', defaultBlockStyles, categoryStyles); -exports = Zelos; +exports.Zelos = Zelos; diff --git a/core/theme_manager.js b/core/theme_manager.js index 91d961dfe..fc1c87c19 100644 --- a/core/theme_manager.js +++ b/core/theme_manager.js @@ -17,14 +17,14 @@ */ goog.module('Blockly.ThemeManager'); -/* eslint-disable-next-line no-unused-vars */ -const Theme = goog.requireType('Blockly.Theme'); -/* eslint-disable-next-line no-unused-vars */ -const Workspace = goog.requireType('Blockly.Workspace'); -/* eslint-disable-next-line no-unused-vars */ -const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); const dom = goog.require('Blockly.utils.dom'); const utils = goog.require('Blockly.utils'); +/* eslint-disable-next-line no-unused-vars */ +const {Theme} = goog.requireType('Blockly.Theme'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg'); +/* eslint-disable-next-line no-unused-vars */ +const {Workspace} = goog.requireType('Blockly.Workspace'); /** @@ -204,4 +204,4 @@ ThemeManager.prototype.dispose = function() { this.componentDB_ = null; }; -exports = ThemeManager; +exports.ThemeManager = ThemeManager; diff --git a/core/toolbox/category.js b/core/toolbox/category.js index 69c9be5f5..389dfe36e 100644 --- a/core/toolbox/category.js +++ b/core/toolbox/category.js @@ -16,13 +16,6 @@ goog.module('Blockly.ToolboxCategory'); const Css = goog.require('Blockly.Css'); -/* eslint-disable-next-line no-unused-vars */ -const ICollapsibleToolboxItem = goog.requireType('Blockly.ICollapsibleToolboxItem'); -/* eslint-disable-next-line no-unused-vars */ -const ISelectableToolboxItem = goog.require('Blockly.ISelectableToolboxItem'); -/* eslint-disable-next-line no-unused-vars */ -const IToolbox = goog.requireType('Blockly.IToolbox'); -const ToolboxItem = goog.require('Blockly.ToolboxItem'); const aria = goog.require('Blockly.utils.aria'); const colourUtils = goog.require('Blockly.utils.colour'); const dom = goog.require('Blockly.utils.dom'); @@ -30,6 +23,13 @@ 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 {ICollapsibleToolboxItem} = goog.requireType('Blockly.ICollapsibleToolboxItem'); +/* eslint-disable-next-line no-unused-vars */ +const {ISelectableToolboxItem} = goog.require('Blockly.ISelectableToolboxItem'); +/* eslint-disable-next-line no-unused-vars */ +const {IToolbox} = goog.requireType('Blockly.IToolbox'); +const {ToolboxItem} = goog.require('Blockly.ToolboxItem'); /** @@ -722,4 +722,4 @@ registry.register( registry.Type.TOOLBOX_ITEM, ToolboxCategory.registrationName, ToolboxCategory); -exports = ToolboxCategory; +exports.ToolboxCategory = ToolboxCategory; diff --git a/core/toolbox/collapsible_category.js b/core/toolbox/collapsible_category.js index 6a257fd32..9baee7e02 100644 --- a/core/toolbox/collapsible_category.js +++ b/core/toolbox/collapsible_category.js @@ -15,19 +15,19 @@ */ goog.module('Blockly.CollapsibleToolboxCategory'); -/* eslint-disable-next-line no-unused-vars */ -const ICollapsibleToolboxItem = goog.require('Blockly.ICollapsibleToolboxItem'); -/* eslint-disable-next-line no-unused-vars */ -const IToolbox = goog.requireType('Blockly.IToolbox'); -/* eslint-disable-next-line no-unused-vars */ -const IToolboxItem = goog.requireType('Blockly.IToolboxItem'); -const ToolboxCategory = goog.require('Blockly.ToolboxCategory'); -const ToolboxSeparator = goog.require('Blockly.ToolboxSeparator'); const aria = goog.require('Blockly.utils.aria'); const dom = goog.require('Blockly.utils.dom'); const object = goog.require('Blockly.utils.object'); const registry = goog.require('Blockly.registry'); const toolbox = goog.require('Blockly.utils.toolbox'); +/* eslint-disable-next-line no-unused-vars */ +const {ICollapsibleToolboxItem} = goog.require('Blockly.ICollapsibleToolboxItem'); +/* eslint-disable-next-line no-unused-vars */ +const {IToolboxItem} = goog.requireType('Blockly.IToolboxItem'); +/* eslint-disable-next-line no-unused-vars */ +const {IToolbox} = goog.requireType('Blockly.IToolbox'); +const {ToolboxCategory} = goog.require('Blockly.ToolboxCategory'); +const {ToolboxSeparator} = goog.require('Blockly.ToolboxSeparator'); /** @@ -308,4 +308,4 @@ registry.register( registry.Type.TOOLBOX_ITEM, CollapsibleToolboxCategory.registrationName, CollapsibleToolboxCategory); -exports = CollapsibleToolboxCategory; +exports.CollapsibleToolboxCategory = CollapsibleToolboxCategory; diff --git a/core/toolbox/separator.js b/core/toolbox/separator.js index 806fbcdef..9d82dc246 100644 --- a/core/toolbox/separator.js +++ b/core/toolbox/separator.js @@ -16,14 +16,14 @@ goog.module('Blockly.ToolboxSeparator'); const Css = goog.require('Blockly.Css'); -/* eslint-disable-next-line no-unused-vars */ -const IToolbox = goog.requireType('Blockly.IToolbox'); -const ToolboxItem = goog.require('Blockly.ToolboxItem'); const dom = goog.require('Blockly.utils.dom'); const object = goog.require('Blockly.utils.object'); const registry = goog.require('Blockly.registry'); /* eslint-disable-next-line no-unused-vars */ const toolbox = goog.requireType('Blockly.utils.toolbox'); +/* eslint-disable-next-line no-unused-vars */ +const {IToolbox} = goog.requireType('Blockly.IToolbox'); +const {ToolboxItem} = goog.require('Blockly.ToolboxItem'); /** @@ -121,4 +121,4 @@ registry.register( registry.Type.TOOLBOX_ITEM, ToolboxSeparator.registrationName, ToolboxSeparator); -exports = ToolboxSeparator; +exports.ToolboxSeparator = ToolboxSeparator; diff --git a/core/toolbox/toolbox.js b/core/toolbox/toolbox.js index 068edf40a..6ac52bc69 100644 --- a/core/toolbox/toolbox.js +++ b/core/toolbox/toolbox.js @@ -15,47 +15,47 @@ */ goog.module('Blockly.Toolbox'); -/* eslint-disable-next-line no-unused-vars */ -const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions'); -const CollapsibleToolboxCategory = goog.require('Blockly.CollapsibleToolboxCategory'); -const ComponentManager = goog.require('Blockly.ComponentManager'); const Css = goog.require('Blockly.Css'); -const DeleteArea = goog.require('Blockly.DeleteArea'); -/* eslint-disable-next-line no-unused-vars */ -const IAutoHideable = goog.require('Blockly.IAutoHideable'); -/* eslint-disable-next-line no-unused-vars */ -const ICollapsibleToolboxItem = goog.requireType('Blockly.ICollapsibleToolboxItem'); -/* eslint-disable-next-line no-unused-vars */ -const IDraggable = goog.requireType('Blockly.IDraggable'); -/* eslint-disable-next-line no-unused-vars */ -const IFlyout = goog.requireType('Blockly.IFlyout'); -/* eslint-disable-next-line no-unused-vars */ -const IKeyboardAccessible = goog.require('Blockly.IKeyboardAccessible'); -/* eslint-disable-next-line no-unused-vars */ -const ISelectableToolboxItem = goog.requireType('Blockly.ISelectableToolboxItem'); -/* eslint-disable-next-line no-unused-vars */ -const IStyleable = goog.require('Blockly.IStyleable'); -/* eslint-disable-next-line no-unused-vars */ -const IToolbox = goog.require('Blockly.IToolbox'); -/* eslint-disable-next-line no-unused-vars */ -const IToolboxItem = goog.requireType('Blockly.IToolboxItem'); -const Options = goog.require('Blockly.Options'); -const Rect = goog.require('Blockly.utils.Rect'); -/* eslint-disable-next-line no-unused-vars */ -const ShortcutRegistry = goog.requireType('Blockly.ShortcutRegistry'); const Touch = goog.require('Blockly.Touch'); -/* eslint-disable-next-line no-unused-vars */ -const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); const aria = goog.require('Blockly.utils.aria'); const browserEvents = goog.require('Blockly.browserEvents'); const common = goog.require('Blockly.common'); const dom = goog.require('Blockly.utils.dom'); const eventUtils = goog.require('Blockly.Events.utils'); -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'); +/* eslint-disable-next-line no-unused-vars */ +const {BlocklyOptions} = goog.requireType('Blockly.BlocklyOptions'); +const {CollapsibleToolboxCategory} = goog.require('Blockly.CollapsibleToolboxCategory'); +const {ComponentManager} = goog.require('Blockly.ComponentManager'); +const {DeleteArea} = goog.require('Blockly.DeleteArea'); +/* eslint-disable-next-line no-unused-vars */ +const {IAutoHideable} = goog.require('Blockly.IAutoHideable'); +/* eslint-disable-next-line no-unused-vars */ +const {ICollapsibleToolboxItem} = goog.requireType('Blockly.ICollapsibleToolboxItem'); +/* eslint-disable-next-line no-unused-vars */ +const {IDraggable} = goog.requireType('Blockly.IDraggable'); +/* eslint-disable-next-line no-unused-vars */ +const {IFlyout} = goog.requireType('Blockly.IFlyout'); +/* eslint-disable-next-line no-unused-vars */ +const {IKeyboardAccessible} = goog.require('Blockly.IKeyboardAccessible'); +/* eslint-disable-next-line no-unused-vars */ +const {ISelectableToolboxItem} = goog.requireType('Blockly.ISelectableToolboxItem'); +/* eslint-disable-next-line no-unused-vars */ +const {IStyleable} = goog.require('Blockly.IStyleable'); +/* eslint-disable-next-line no-unused-vars */ +const {IToolboxItem} = goog.requireType('Blockly.IToolboxItem'); +/* eslint-disable-next-line no-unused-vars */ +const {IToolbox} = goog.require('Blockly.IToolbox'); +const {KeyCodes} = goog.require('Blockly.utils.KeyCodes'); +const {Options} = goog.require('Blockly.Options'); +const {Rect} = goog.require('Blockly.utils.Rect'); +/* eslint-disable-next-line no-unused-vars */ +const {ShortcutRegistry} = goog.requireType('Blockly.ShortcutRegistry'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.ToolboxItemSelect'); @@ -342,20 +342,20 @@ Toolbox.prototype.onClick_ = function(e) { Toolbox.prototype.onKeyDown_ = function(e) { let handled = false; switch (e.keyCode) { - case keyCodes.DOWN: + case KeyCodes.DOWN: handled = this.selectNext_(); break; - case keyCodes.UP: + case KeyCodes.UP: handled = this.selectPrevious_(); break; - case keyCodes.LEFT: + case KeyCodes.LEFT: handled = this.selectParent_(); break; - case keyCodes.RIGHT: + case KeyCodes.RIGHT: handled = this.selectChild_(); break; - case keyCodes.ENTER: - case keyCodes.SPACE: + case KeyCodes.ENTER: + case KeyCodes.SPACE: if (this.selectedItem_ && this.selectedItem_.isCollapsible()) { const collapsibleItem = /** @type {!ICollapsibleToolboxItem} */ (this.selectedItem_); @@ -1150,4 +1150,4 @@ Css.register(` registry.register(registry.Type.TOOLBOX, registry.DEFAULT, Toolbox); -exports = Toolbox; +exports.Toolbox = Toolbox; diff --git a/core/toolbox/toolbox_item.js b/core/toolbox/toolbox_item.js index a3b5504ec..2403cf4d0 100644 --- a/core/toolbox/toolbox_item.js +++ b/core/toolbox/toolbox_item.js @@ -15,17 +15,17 @@ */ goog.module('Blockly.ToolboxItem'); -/* eslint-disable-next-line no-unused-vars */ -const ICollapsibleToolboxItem = goog.requireType('Blockly.ICollapsibleToolboxItem'); -/* eslint-disable-next-line no-unused-vars */ -const IToolbox = goog.requireType('Blockly.IToolbox'); -/* eslint-disable-next-line no-unused-vars */ -const IToolboxItem = goog.require('Blockly.IToolboxItem'); -/* eslint-disable-next-line no-unused-vars */ -const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); const idGenerator = goog.require('Blockly.utils.idGenerator'); /* eslint-disable-next-line no-unused-vars */ const toolbox = goog.requireType('Blockly.utils.toolbox'); +/* eslint-disable-next-line no-unused-vars */ +const {ICollapsibleToolboxItem} = goog.requireType('Blockly.ICollapsibleToolboxItem'); +/* eslint-disable-next-line no-unused-vars */ +const {IToolboxItem} = goog.require('Blockly.IToolboxItem'); +/* eslint-disable-next-line no-unused-vars */ +const {IToolbox} = goog.requireType('Blockly.IToolbox'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg'); /** @@ -154,4 +154,4 @@ ToolboxItem.prototype.isCollapsible = function() { */ ToolboxItem.prototype.dispose = function() {}; -exports = ToolboxItem; +exports.ToolboxItem = ToolboxItem; diff --git a/core/touch.js b/core/touch.js index a7d3b99d5..6068006d0 100644 --- a/core/touch.js +++ b/core/touch.js @@ -15,11 +15,11 @@ */ goog.module('Blockly.Touch'); -/* eslint-disable-next-line no-unused-vars */ -const Gesture = goog.requireType('Blockly.Gesture'); const internalConstants = goog.require('Blockly.internalConstants'); -const {globalThis} = goog.require('Blockly.utils.global'); const utilsString = goog.require('Blockly.utils.string'); +/* eslint-disable-next-line no-unused-vars */ +const {Gesture} = goog.requireType('Blockly.Gesture'); +const {globalThis} = goog.require('Blockly.utils.global'); /** diff --git a/core/touch_gesture.js b/core/touch_gesture.js index 0212c41d5..71634324b 100644 --- a/core/touch_gesture.js +++ b/core/touch_gesture.js @@ -17,13 +17,13 @@ */ goog.module('Blockly.TouchGesture'); -const Coordinate = goog.require('Blockly.utils.Coordinate'); -const Gesture = goog.require('Blockly.Gesture'); const Touch = goog.require('Blockly.Touch'); -/* eslint-disable-next-line no-unused-vars */ -const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); const browserEvents = goog.require('Blockly.browserEvents'); const object = goog.require('Blockly.utils.object'); +const {Coordinate} = goog.require('Blockly.utils.Coordinate'); +const {Gesture} = goog.require('Blockly.Gesture'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg'); /* @@ -327,4 +327,4 @@ TouchGesture.prototype.getTouchPoint = function(e) { (e.pageY ? e.pageY : e.changedTouches[0].pageY)); }; -exports = TouchGesture; +exports.TouchGesture = TouchGesture; diff --git a/core/trashcan.js b/core/trashcan.js index f0777257d..47e44925f 100644 --- a/core/trashcan.js +++ b/core/trashcan.js @@ -18,26 +18,6 @@ goog.module('Blockly.Trashcan'); /* eslint-disable-next-line no-unused-vars */ const Abstract = goog.requireType('Blockly.Events.Abstract'); /* eslint-disable-next-line no-unused-vars */ -const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions'); -const ComponentManager = goog.require('Blockly.ComponentManager'); -const DeleteArea = goog.require('Blockly.DeleteArea'); -/* eslint-disable-next-line no-unused-vars */ -const IAutoHideable = goog.require('Blockly.IAutoHideable'); -/* eslint-disable-next-line no-unused-vars */ -const IDraggable = goog.requireType('Blockly.IDraggable'); -/* eslint-disable-next-line no-unused-vars */ -const IFlyout = goog.requireType('Blockly.IFlyout'); -/* eslint-disable-next-line no-unused-vars */ -const IPositionable = goog.require('Blockly.IPositionable'); -/* eslint-disable-next-line no-unused-vars */ -const MetricsManager = goog.requireType('Blockly.MetricsManager'); -const Options = goog.require('Blockly.Options'); -const Rect = goog.require('Blockly.utils.Rect'); -const Size = goog.require('Blockly.utils.Size'); -const Svg = goog.require('Blockly.utils.Svg'); -/* eslint-disable-next-line no-unused-vars */ -const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); -/* eslint-disable-next-line no-unused-vars */ const blocks = goog.requireType('Blockly.serialization.blocks'); const browserEvents = goog.require('Blockly.browserEvents'); const dom = goog.require('Blockly.utils.dom'); @@ -47,6 +27,26 @@ const object = goog.require('Blockly.utils.object'); const registry = goog.require('Blockly.registry'); const toolbox = goog.require('Blockly.utils.toolbox'); const uiPosition = goog.require('Blockly.uiPosition'); +/* eslint-disable-next-line no-unused-vars */ +const {BlocklyOptions} = goog.requireType('Blockly.BlocklyOptions'); +const {ComponentManager} = goog.require('Blockly.ComponentManager'); +const {DeleteArea} = goog.require('Blockly.DeleteArea'); +/* eslint-disable-next-line no-unused-vars */ +const {IAutoHideable} = goog.require('Blockly.IAutoHideable'); +/* eslint-disable-next-line no-unused-vars */ +const {IDraggable} = goog.requireType('Blockly.IDraggable'); +/* eslint-disable-next-line no-unused-vars */ +const {IFlyout} = goog.requireType('Blockly.IFlyout'); +/* eslint-disable-next-line no-unused-vars */ +const {IPositionable} = goog.require('Blockly.IPositionable'); +/* eslint-disable-next-line no-unused-vars */ +const {MetricsManager} = goog.requireType('Blockly.MetricsManager'); +const {Options} = goog.require('Blockly.Options'); +const {Rect} = goog.require('Blockly.utils.Rect'); +const {Size} = goog.require('Blockly.utils.Size'); +const {Svg} = goog.require('Blockly.utils.Svg'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.TrashcanOpen'); @@ -739,4 +739,4 @@ Trashcan.prototype.cleanBlockJson_ = function(json) { return JSON.stringify(json); }; -exports = Trashcan; +exports.Trashcan = Trashcan; diff --git a/core/utils.js b/core/utils.js index d70525f51..15de9406c 100644 --- a/core/utils.js +++ b/core/utils.js @@ -19,15 +19,7 @@ */ goog.module('Blockly.utils'); -const Coordinate = goog.require('Blockly.utils.Coordinate'); -const KeyCodes = goog.require('Blockly.utils.KeyCodes'); -const Metrics = goog.require('Blockly.utils.Metrics'); const Msg = goog.require('Blockly.Msg'); -const Rect = goog.require('Blockly.utils.Rect'); -const Size = goog.require('Blockly.utils.Size'); -const Svg = goog.require('Blockly.utils.Svg'); -/* eslint-disable-next-line no-unused-vars */ -const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); const aria = goog.require('Blockly.utils.aria'); const browserEvents = goog.require('Blockly.browserEvents'); const colourUtils = goog.require('Blockly.utils.colour'); @@ -46,6 +38,14 @@ 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'); +const {Coordinate} = goog.require('Blockly.utils.Coordinate'); +const {KeyCodes} = goog.require('Blockly.utils.KeyCodes'); +const {Metrics} = goog.require('Blockly.utils.Metrics'); +const {Rect} = goog.require('Blockly.utils.Rect'); +const {Size} = goog.require('Blockly.utils.Size'); +const {Svg} = goog.require('Blockly.utils.Svg'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg'); exports.aria = aria; diff --git a/core/utils/coordinate.js b/core/utils/coordinate.js index 1aa22724a..1a8dece05 100644 --- a/core/utils/coordinate.js +++ b/core/utils/coordinate.js @@ -133,4 +133,4 @@ Coordinate.prototype.translate = function(tx, ty) { return this; }; -exports = Coordinate; +exports.Coordinate = Coordinate; diff --git a/core/utils/dom.js b/core/utils/dom.js index 71b00662f..d74bef25a 100644 --- a/core/utils/dom.js +++ b/core/utils/dom.js @@ -19,9 +19,9 @@ */ goog.module('Blockly.utils.dom'); -/* eslint-disable-next-line no-unused-vars */ -const Svg = goog.requireType('Blockly.utils.Svg'); const userAgent = goog.require('Blockly.utils.userAgent'); +/* eslint-disable-next-line no-unused-vars */ +const {Svg} = goog.requireType('Blockly.utils.Svg'); /** diff --git a/core/utils/keycodes.js b/core/utils/keycodes.js index 0e1403c17..948470b3f 100644 --- a/core/utils/keycodes.js +++ b/core/utils/keycodes.js @@ -169,4 +169,4 @@ const KeyCodes = { PHANTOM: 255 }; -exports = KeyCodes; +exports.KeyCodes = KeyCodes; diff --git a/core/utils/metrics.js b/core/utils/metrics.js index 9d1512ac6..50a45dfe3 100644 --- a/core/utils/metrics.js +++ b/core/utils/metrics.js @@ -151,4 +151,4 @@ Metrics.prototype.flyoutWidth; */ Metrics.prototype.flyoutHeight; -exports = Metrics; +exports.Metrics = Metrics; diff --git a/core/utils/rect.js b/core/utils/rect.js index 7843ec1f0..8ecf7d358 100644 --- a/core/utils/rect.js +++ b/core/utils/rect.js @@ -58,7 +58,7 @@ Rect.prototype.contains = function(x, y) { /** * Tests whether this rectangle intersects the provided rectangle. * Assumes that the coordinate system increases going down and left. - * @param {!Blockly.utils.Rect} other The other rectangle to check for + * @param {!Rect} other The other rectangle to check for * intersection with. * @return {boolean} Whether this rectangle intersects the provided rectangle. */ @@ -68,4 +68,4 @@ Rect.prototype.intersects = function(other) { this.top > other.bottom || this.bottom < other.top); }; -exports = Rect; +exports.Rect = Rect; diff --git a/core/utils/size.js b/core/utils/size.js index 409f45480..13c5e40f4 100644 --- a/core/utils/size.js +++ b/core/utils/size.js @@ -59,4 +59,4 @@ Size.equals = function(a, b) { return a.width === b.width && a.height === b.height; }; -exports = Size; +exports.Size = Size; diff --git a/core/utils/style.js b/core/utils/style.js index a256e2628..10dbccf77 100644 --- a/core/utils/style.js +++ b/core/utils/style.js @@ -19,8 +19,8 @@ */ goog.module('Blockly.utils.style'); -const Coordinate = goog.require('Blockly.utils.Coordinate'); -const Size = goog.require('Blockly.utils.Size'); +const {Coordinate} = goog.require('Blockly.utils.Coordinate'); +const {Size} = goog.require('Blockly.utils.Size'); /** diff --git a/core/utils/svg.js b/core/utils/svg.js index 188f54a32..1e3338ba7 100644 --- a/core/utils/svg.js +++ b/core/utils/svg.js @@ -181,4 +181,4 @@ Svg.TEXT = new Svg('text'); */ Svg.TSPAN = new Svg('tspan'); -exports = Svg; +exports.Svg = Svg; diff --git a/core/utils/toolbox.js b/core/utils/toolbox.js index b9bf193d7..dcad11319 100644 --- a/core/utils/toolbox.js +++ b/core/utils/toolbox.js @@ -15,14 +15,14 @@ */ goog.module('Blockly.utils.toolbox'); +const Xml = goog.require('Blockly.Xml'); +const userAgent = goog.require('Blockly.utils.userAgent'); /* eslint-disable-next-line no-unused-vars */ const {ConnectionState} = goog.requireType('Blockly.serialization.blocks'); /* eslint-disable-next-line no-unused-vars */ -const ToolboxCategory = goog.requireType('Blockly.ToolboxCategory'); +const {ToolboxCategory} = goog.requireType('Blockly.ToolboxCategory'); /* eslint-disable-next-line no-unused-vars */ -const ToolboxSeparator = goog.requireType('Blockly.ToolboxSeparator'); -const Xml = goog.require('Blockly.Xml'); -const userAgent = goog.require('Blockly.utils.userAgent'); +const {ToolboxSeparator} = goog.requireType('Blockly.ToolboxSeparator'); /** * The information needed to create a block in the toolbox. diff --git a/core/variable_map.js b/core/variable_map.js index a87109ec3..b19882ad9 100644 --- a/core/variable_map.js +++ b/core/variable_map.js @@ -16,10 +16,6 @@ goog.module('Blockly.VariableMap'); const Msg = goog.require('Blockly.Msg'); -const Names = goog.require('Blockly.Names'); -const VariableModel = goog.require('Blockly.VariableModel'); -/* eslint-disable-next-line no-unused-vars */ -const Workspace = goog.requireType('Blockly.Workspace'); const dialog = goog.require('Blockly.dialog'); const eventUtils = goog.require('Blockly.Events.utils'); const idGenerator = goog.require('Blockly.utils.idGenerator'); @@ -27,6 +23,10 @@ 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'); +const {Names} = goog.require('Blockly.Names'); +const {VariableModel} = goog.require('Blockly.VariableModel'); +/* eslint-disable-next-line no-unused-vars */ +const {Workspace} = goog.requireType('Blockly.Workspace'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.VarDelete'); /** @suppress {extraRequire} */ @@ -423,4 +423,4 @@ VariableMap.prototype.getVariableUsesById = function(id) { return uses; }; -exports = VariableMap; +exports.VariableMap = VariableMap; diff --git a/core/variable_model.js b/core/variable_model.js index 442e25ef8..d169b4a49 100644 --- a/core/variable_model.js +++ b/core/variable_model.js @@ -15,10 +15,10 @@ */ goog.module('Blockly.VariableModel'); -/* eslint-disable-next-line no-unused-vars */ -const Workspace = goog.requireType('Blockly.Workspace'); const eventUtils = goog.require('Blockly.Events.utils'); const idGenerator = goog.require('Blockly.utils.idGenerator'); +/* eslint-disable-next-line no-unused-vars */ +const {Workspace} = goog.requireType('Blockly.Workspace'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.VarCreate'); @@ -92,4 +92,4 @@ VariableModel.compareByName = function(var1, var2) { return var1.name.localeCompare(var2.name, undefined, {sensitivity: 'base'}); }; -exports = VariableModel; +exports.VariableModel = VariableModel; diff --git a/core/variables.js b/core/variables.js index c16df792a..7565b5f69 100644 --- a/core/variables.js +++ b/core/variables.js @@ -16,13 +16,13 @@ goog.module('Blockly.Variables'); const Msg = goog.require('Blockly.Msg'); -const VariableModel = goog.require('Blockly.VariableModel'); -/* eslint-disable-next-line no-unused-vars */ -const Workspace = goog.requireType('Blockly.Workspace'); const Xml = goog.require('Blockly.Xml'); const dialog = goog.require('Blockly.dialog'); const utilsXml = goog.require('Blockly.utils.xml'); const {Blocks} = goog.require('Blockly.blocks'); +const {VariableModel} = goog.require('Blockly.VariableModel'); +/* eslint-disable-next-line no-unused-vars */ +const {Workspace} = goog.requireType('Blockly.Workspace'); /** diff --git a/core/variables_dynamic.js b/core/variables_dynamic.js index 6a11196e2..a4a3a9ebb 100644 --- a/core/variables_dynamic.js +++ b/core/variables_dynamic.js @@ -18,12 +18,12 @@ goog.module('Blockly.VariablesDynamic'); const Msg = goog.require('Blockly.Msg'); -const VariableModel = goog.require('Blockly.VariableModel'); const Variables = goog.require('Blockly.Variables'); -/* eslint-disable-next-line no-unused-vars */ -const Workspace = goog.requireType('Blockly.Workspace'); const xml = goog.require('Blockly.utils.xml'); const {Blocks} = goog.require('Blockly.blocks'); +const {VariableModel} = goog.require('Blockly.VariableModel'); +/* eslint-disable-next-line no-unused-vars */ +const {Workspace} = goog.requireType('Blockly.Workspace'); const onCreateVariableButtonClick_String = function(button) { diff --git a/core/warning.js b/core/warning.js index e20634cd8..def1f6312 100644 --- a/core/warning.js +++ b/core/warning.js @@ -15,18 +15,18 @@ */ goog.module('Blockly.Warning'); -const Bubble = goog.require('Blockly.Bubble'); -/* eslint-disable-next-line no-unused-vars */ -const Coordinate = goog.requireType('Blockly.utils.Coordinate'); -const Icon = goog.require('Blockly.Icon'); -const Svg = goog.require('Blockly.utils.Svg'); const dom = goog.require('Blockly.utils.dom'); const eventUtils = goog.require('Blockly.Events.utils'); 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'); +/* eslint-disable-next-line no-unused-vars */ +const {Block} = goog.requireType('Blockly.Block'); +const {Bubble} = goog.require('Blockly.Bubble'); +/* eslint-disable-next-line no-unused-vars */ +const {Coordinate} = goog.requireType('Blockly.utils.Coordinate'); +const {Icon} = goog.require('Blockly.Icon'); +const {Svg} = goog.require('Blockly.utils.Svg'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.BubbleOpen'); @@ -166,4 +166,4 @@ Warning.prototype.dispose = function() { Icon.prototype.dispose.call(this); }; -exports = Warning; +exports.Warning = Warning; diff --git a/core/widgetdiv.js b/core/widgetdiv.js index 2c7c05425..516a9b4c2 100644 --- a/core/widgetdiv.js +++ b/core/widgetdiv.js @@ -19,15 +19,15 @@ */ goog.module('Blockly.WidgetDiv'); -/* eslint-disable-next-line no-unused-vars */ -const Rect = goog.requireType('Blockly.utils.Rect'); -/* 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 common = goog.require('Blockly.common'); const deprecation = goog.require('Blockly.utils.deprecation'); const dom = goog.require('Blockly.utils.dom'); +/* eslint-disable-next-line no-unused-vars */ +const {Rect} = goog.requireType('Blockly.utils.Rect'); +/* 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'); /** diff --git a/core/workspace.js b/core/workspace.js index 4beffd981..ca39c0c3f 100644 --- a/core/workspace.js +++ b/core/workspace.js @@ -17,29 +17,29 @@ goog.module('Blockly.Workspace'); /* eslint-disable-next-line no-unused-vars */ const Abstract = goog.requireType('Blockly.Events.Abstract'); -/* 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'); -/* eslint-disable-next-line no-unused-vars */ -const IASTNodeLocation = goog.require('Blockly.IASTNodeLocation'); -/* eslint-disable-next-line no-unused-vars */ -const IConnectionChecker = goog.requireType('Blockly.IConnectionChecker'); -const Options = goog.require('Blockly.Options'); -const VariableMap = goog.require('Blockly.VariableMap'); -/* eslint-disable-next-line no-unused-vars */ -const VariableModel = goog.requireType('Blockly.VariableModel'); -/* eslint-disable-next-line no-unused-vars */ -const WorkspaceComment = goog.requireType('Blockly.WorkspaceComment'); -const idGenerator = goog.require('Blockly.utils.idGenerator'); const eventUtils = goog.require('Blockly.Events.utils'); +const idGenerator = goog.require('Blockly.utils.idGenerator'); const math = goog.require('Blockly.utils.math'); 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 {BlocklyOptions} = goog.requireType('Blockly.BlocklyOptions'); +/* eslint-disable-next-line no-unused-vars */ const {Block} = goog.requireType('Blockly.Block'); +/* eslint-disable-next-line no-unused-vars */ +const {ConnectionDB} = goog.requireType('Blockly.ConnectionDB'); +/* eslint-disable-next-line no-unused-vars */ +const {IASTNodeLocation} = goog.require('Blockly.IASTNodeLocation'); +/* eslint-disable-next-line no-unused-vars */ +const {IConnectionChecker} = goog.requireType('Blockly.IConnectionChecker'); +const {Options} = goog.require('Blockly.Options'); +const {VariableMap} = goog.require('Blockly.VariableMap'); +/* eslint-disable-next-line no-unused-vars */ +const {VariableModel} = goog.requireType('Blockly.VariableModel'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceComment} = goog.requireType('Blockly.WorkspaceComment'); /** @suppress {extraRequire} */ goog.require('Blockly.ConnectionChecker'); @@ -812,4 +812,4 @@ Workspace.getAll = function() { return workspaces; }; -exports = Workspace; +exports.Workspace = Workspace; diff --git a/core/workspace_audio.js b/core/workspace_audio.js index b6571116d..5fd0eff4f 100644 --- a/core/workspace_audio.js +++ b/core/workspace_audio.js @@ -17,11 +17,11 @@ */ goog.module('Blockly.WorkspaceAudio'); -/* eslint-disable-next-line no-unused-vars */ -const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); -const {globalThis} = goog.require('Blockly.utils.global'); const internalConstants = goog.require('Blockly.internalConstants'); const userAgent = goog.require('Blockly.utils.userAgent'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg'); +const {globalThis} = goog.require('Blockly.utils.global'); /** @@ -160,4 +160,4 @@ WorkspaceAudio.prototype.play = function(name, opt_volume) { } }; -exports = WorkspaceAudio; +exports.WorkspaceAudio = WorkspaceAudio; diff --git a/core/workspace_comment.js b/core/workspace_comment.js index 1cacf6149..7f8d6d375 100644 --- a/core/workspace_comment.js +++ b/core/workspace_comment.js @@ -15,12 +15,12 @@ */ goog.module('Blockly.WorkspaceComment'); -const Coordinate = goog.require('Blockly.utils.Coordinate'); -/* eslint-disable-next-line no-unused-vars */ -const Workspace = goog.requireType('Blockly.Workspace'); -const idGenerator = goog.require('Blockly.utils.idGenerator'); const eventUtils = goog.require('Blockly.Events.utils'); +const idGenerator = goog.require('Blockly.utils.idGenerator'); const xml = goog.require('Blockly.utils.xml'); +const {Coordinate} = goog.require('Blockly.utils.Coordinate'); +/* eslint-disable-next-line no-unused-vars */ +const {Workspace} = goog.requireType('Blockly.Workspace'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.CommentChange'); /** @suppress {extraRequire} */ @@ -387,4 +387,4 @@ WorkspaceComment.parseAttributes = function(xml) { }; }; -exports = WorkspaceComment; +exports.WorkspaceComment = WorkspaceComment; diff --git a/core/workspace_comment_svg.js b/core/workspace_comment_svg.js index 29ca28b9e..608ef7ac9 100644 --- a/core/workspace_comment_svg.js +++ b/core/workspace_comment_svg.js @@ -16,20 +16,8 @@ goog.module('Blockly.WorkspaceCommentSvg'); const ContextMenu = goog.require('Blockly.ContextMenu'); -const Coordinate = goog.require('Blockly.utils.Coordinate'); const Css = goog.require('Blockly.Css'); -/* eslint-disable-next-line no-unused-vars */ -const IBoundedElement = goog.require('Blockly.IBoundedElement'); -/* eslint-disable-next-line no-unused-vars */ -const IBubble = goog.require('Blockly.IBubble'); -/* eslint-disable-next-line no-unused-vars */ -const ICopyable = goog.require('Blockly.ICopyable'); -const Rect = goog.require('Blockly.utils.Rect'); -const Svg = goog.require('Blockly.utils.Svg'); const Touch = goog.require('Blockly.Touch'); -/* eslint-disable-next-line no-unused-vars */ -const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); -const WorkspaceComment = goog.require('Blockly.WorkspaceComment'); const browserEvents = goog.require('Blockly.browserEvents'); const common = goog.require('Blockly.common'); const dom = goog.require('Blockly.utils.dom'); @@ -38,6 +26,18 @@ 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'); +const {Coordinate} = goog.require('Blockly.utils.Coordinate'); +/* eslint-disable-next-line no-unused-vars */ +const {IBoundedElement} = goog.require('Blockly.IBoundedElement'); +/* eslint-disable-next-line no-unused-vars */ +const {IBubble} = goog.require('Blockly.IBubble'); +/* eslint-disable-next-line no-unused-vars */ +const {ICopyable} = goog.require('Blockly.ICopyable'); +const {Rect} = goog.require('Blockly.utils.Rect'); +const {Svg} = goog.require('Blockly.utils.Svg'); +const {WorkspaceComment} = goog.require('Blockly.WorkspaceComment'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.CommentCreate'); /** @suppress {extraRequire} */ @@ -1139,4 +1139,4 @@ Css.register(` } `); -exports = WorkspaceCommentSvg; +exports.WorkspaceCommentSvg = WorkspaceCommentSvg; diff --git a/core/workspace_drag_surface_svg.js b/core/workspace_drag_surface_svg.js index 915756a28..7f9905c0c 100644 --- a/core/workspace_drag_surface_svg.js +++ b/core/workspace_drag_surface_svg.js @@ -22,11 +22,11 @@ */ goog.module('Blockly.WorkspaceDragSurfaceSvg'); -/* eslint-disable-next-line no-unused-vars */ -const Coordinate = goog.requireType('Blockly.utils.Coordinate'); -const Svg = goog.require('Blockly.utils.Svg'); const dom = goog.require('Blockly.utils.dom'); const utils = goog.require('Blockly.utils'); +/* eslint-disable-next-line no-unused-vars */ +const {Coordinate} = goog.requireType('Blockly.utils.Coordinate'); +const {Svg} = goog.require('Blockly.utils.Svg'); /** @@ -184,4 +184,4 @@ WorkspaceDragSurfaceSvg.prototype.setContentsAndShow = function( this.SVG_.style.display = 'block'; }; -exports = WorkspaceDragSurfaceSvg; +exports.WorkspaceDragSurfaceSvg = WorkspaceDragSurfaceSvg; diff --git a/core/workspace_dragger.js b/core/workspace_dragger.js index 56b229069..f888f3514 100644 --- a/core/workspace_dragger.js +++ b/core/workspace_dragger.js @@ -15,10 +15,10 @@ */ goog.module('Blockly.WorkspaceDragger'); -const Coordinate = goog.require('Blockly.utils.Coordinate'); -/* eslint-disable-next-line no-unused-vars */ -const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); const common = goog.require('Blockly.common'); +const {Coordinate} = goog.require('Blockly.utils.Coordinate'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg'); /** @@ -113,4 +113,4 @@ WorkspaceDragger.prototype.drag = function(currentDragDeltaXY) { } }; -exports = WorkspaceDragger; +exports.WorkspaceDragger = WorkspaceDragger; diff --git a/core/workspace_svg.js b/core/workspace_svg.js index f2aa6995b..904ad1a3f 100644 --- a/core/workspace_svg.js +++ b/core/workspace_svg.js @@ -15,69 +15,16 @@ */ goog.module('Blockly.WorkspaceSvg'); -/* eslint-disable-next-line no-unused-vars */ -const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions'); -const Classic = goog.require('Blockly.Themes.Classic'); -const ComponentManager = goog.require('Blockly.ComponentManager'); -const ConnectionDB = goog.require('Blockly.ConnectionDB'); const ContextMenu = goog.require('Blockly.ContextMenu'); -const ContextMenuRegistry = goog.require('Blockly.ContextMenuRegistry'); -const Coordinate = goog.require('Blockly.utils.Coordinate'); -const DropDownDiv = goog.require('Blockly.DropDownDiv'); -/* eslint-disable-next-line no-unused-vars */ -const FlyoutButton = goog.requireType('Blockly.FlyoutButton'); -const Gesture = goog.require('Blockly.Gesture'); -const Grid = goog.require('Blockly.Grid'); -/* eslint-disable-next-line no-unused-vars */ -const IASTNodeLocationSvg = goog.require('Blockly.IASTNodeLocationSvg'); -/* eslint-disable-next-line no-unused-vars */ -const IBoundedElement = goog.requireType('Blockly.IBoundedElement'); -/* eslint-disable-next-line no-unused-vars */ -const IDragTarget = goog.requireType('Blockly.IDragTarget'); -/* eslint-disable-next-line no-unused-vars */ -const IFlyout = goog.requireType('Blockly.IFlyout'); -/* eslint-disable-next-line no-unused-vars */ -const IMetricsManager = goog.requireType('Blockly.IMetricsManager'); -/* eslint-disable-next-line no-unused-vars */ -const IToolbox = goog.requireType('Blockly.IToolbox'); -const MarkerManager = goog.require('Blockly.MarkerManager'); -/* eslint-disable-next-line no-unused-vars */ -const Metrics = goog.requireType('Blockly.utils.Metrics'); -const Options = goog.require('Blockly.Options'); /* eslint-disable-next-line no-unused-vars */ const Procedures = goog.requireType('Blockly.Procedures'); -const Rect = goog.require('Blockly.utils.Rect'); -/* eslint-disable-next-line no-unused-vars */ -const Renderer = goog.requireType('Blockly.blockRendering.Renderer'); -/* eslint-disable-next-line no-unused-vars */ -const ScrollbarPair = goog.requireType('Blockly.ScrollbarPair'); -const Size = goog.require('Blockly.utils.Size'); -const Svg = goog.require('Blockly.utils.Svg'); -/* eslint-disable-next-line no-unused-vars */ -const Theme = goog.requireType('Blockly.Theme'); -const ThemeManager = goog.require('Blockly.ThemeManager'); const Tooltip = goog.require('Blockly.Tooltip'); -const TouchGesture = goog.require('Blockly.TouchGesture'); -/* eslint-disable-next-line no-unused-vars */ -const Trashcan = goog.requireType('Blockly.Trashcan'); -/* eslint-disable-next-line no-unused-vars */ -const VariableModel = goog.requireType('Blockly.VariableModel'); /* eslint-disable-next-line no-unused-vars */ const Variables = goog.requireType('Blockly.Variables'); /* eslint-disable-next-line no-unused-vars */ const VariablesDynamic = goog.requireType('Blockly.VariablesDynamic'); const WidgetDiv = goog.require('Blockly.WidgetDiv'); -const Workspace = goog.require('Blockly.Workspace'); -const WorkspaceAudio = goog.require('Blockly.WorkspaceAudio'); -/* eslint-disable-next-line no-unused-vars */ -const WorkspaceComment = goog.requireType('Blockly.WorkspaceComment'); -/* eslint-disable-next-line no-unused-vars */ -const WorkspaceCommentSvg = goog.requireType('Blockly.WorkspaceCommentSvg'); -/* eslint-disable-next-line no-unused-vars */ -const WorkspaceDragSurfaceSvg = goog.requireType('Blockly.WorkspaceDragSurfaceSvg'); const Xml = goog.require('Blockly.Xml'); -/* eslint-disable-next-line no-unused-vars */ -const ZoomControls = goog.requireType('Blockly.ZoomControls'); const blockRendering = goog.require('Blockly.blockRendering'); const blocks = goog.require('Blockly.serialization.blocks'); const browserEvents = goog.require('Blockly.browserEvents'); @@ -91,14 +38,67 @@ const toolbox = goog.require('Blockly.utils.toolbox'); 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 {BlockDragSurfaceSvg} = goog.requireType('Blockly.BlockDragSurfaceSvg'); const {BlockSvg} = goog.require('Blockly.BlockSvg'); /* eslint-disable-next-line no-unused-vars */ +const {BlocklyOptions} = goog.requireType('Blockly.BlocklyOptions'); +/* eslint-disable-next-line no-unused-vars */ +const {Block} = goog.requireType('Blockly.Block'); +const {Classic} = goog.require('Blockly.Themes.Classic'); +const {ComponentManager} = goog.require('Blockly.ComponentManager'); +const {ConnectionDB} = goog.require('Blockly.ConnectionDB'); +const {ContextMenuRegistry} = goog.require('Blockly.ContextMenuRegistry'); +const {Coordinate} = goog.require('Blockly.utils.Coordinate'); +/* eslint-disable-next-line no-unused-vars */ const {Cursor} = goog.requireType('Blockly.Cursor'); +const {DropDownDiv} = goog.require('Blockly.DropDownDiv'); +/* eslint-disable-next-line no-unused-vars */ +const {FlyoutButton} = goog.requireType('Blockly.FlyoutButton'); +const {Gesture} = goog.require('Blockly.Gesture'); +const {Grid} = goog.require('Blockly.Grid'); +/* eslint-disable-next-line no-unused-vars */ +const {IASTNodeLocationSvg} = goog.require('Blockly.IASTNodeLocationSvg'); +/* eslint-disable-next-line no-unused-vars */ +const {IBoundedElement} = goog.requireType('Blockly.IBoundedElement'); +/* eslint-disable-next-line no-unused-vars */ +const {IDragTarget} = goog.requireType('Blockly.IDragTarget'); +/* eslint-disable-next-line no-unused-vars */ +const {IFlyout} = goog.requireType('Blockly.IFlyout'); +/* eslint-disable-next-line no-unused-vars */ +const {IMetricsManager} = goog.requireType('Blockly.IMetricsManager'); +/* eslint-disable-next-line no-unused-vars */ +const {IToolbox} = goog.requireType('Blockly.IToolbox'); +const {MarkerManager} = goog.require('Blockly.MarkerManager'); /* eslint-disable-next-line no-unused-vars */ const {Marker} = goog.requireType('Blockly.Marker'); +/* eslint-disable-next-line no-unused-vars */ +const {Metrics} = goog.requireType('Blockly.utils.Metrics'); +const {Options} = goog.require('Blockly.Options'); +const {Rect} = goog.require('Blockly.utils.Rect'); +/* eslint-disable-next-line no-unused-vars */ +const {Renderer} = goog.requireType('Blockly.blockRendering.Renderer'); +/* eslint-disable-next-line no-unused-vars */ +const {ScrollbarPair} = goog.requireType('Blockly.ScrollbarPair'); +const {Size} = goog.require('Blockly.utils.Size'); +const {Svg} = goog.require('Blockly.utils.Svg'); +const {ThemeManager} = goog.require('Blockly.ThemeManager'); +/* eslint-disable-next-line no-unused-vars */ +const {Theme} = goog.requireType('Blockly.Theme'); +const {TouchGesture} = goog.require('Blockly.TouchGesture'); +/* eslint-disable-next-line no-unused-vars */ +const {Trashcan} = goog.requireType('Blockly.Trashcan'); +/* eslint-disable-next-line no-unused-vars */ +const {VariableModel} = goog.requireType('Blockly.VariableModel'); +const {WorkspaceAudio} = goog.require('Blockly.WorkspaceAudio'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceCommentSvg} = goog.requireType('Blockly.WorkspaceCommentSvg'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceComment} = goog.requireType('Blockly.WorkspaceComment'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceDragSurfaceSvg} = goog.requireType('Blockly.WorkspaceDragSurfaceSvg'); +const {Workspace} = goog.require('Blockly.Workspace'); +/* eslint-disable-next-line no-unused-vars */ +const {ZoomControls} = goog.requireType('Blockly.ZoomControls'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.BlockCreate'); /** @suppress {extraRequire} */ @@ -1054,7 +1054,7 @@ WorkspaceSvg.prototype.newBlock = function(prototypeName, opt_id) { * @package */ WorkspaceSvg.prototype.addTrashcan = function() { - const Trashcan = goog.module.get('Blockly.Trashcan'); + const {Trashcan} = goog.module.get('Blockly.Trashcan'); if (!Trashcan) { throw Error('Missing require for Blockly.Trashcan'); } @@ -1069,7 +1069,7 @@ WorkspaceSvg.prototype.addTrashcan = function() { * @package */ WorkspaceSvg.prototype.addZoomControls = function() { - const ZoomControls = goog.module.get('Blockly.ZoomControls'); + const {ZoomControls} = goog.module.get('Blockly.ZoomControls'); if (!ZoomControls) { throw Error('Missing require for Blockly.ZoomControls'); } @@ -2695,4 +2695,4 @@ WorkspaceSvg.prototype.hideChaff = function(opt_onlyClosePopups) { (autoHideable) => autoHideable.autoHide(onlyClosePopups)); }; -exports = WorkspaceSvg; +exports.WorkspaceSvg = WorkspaceSvg; diff --git a/core/xml.js b/core/xml.js index 6749744fc..663d1ee0a 100644 --- a/core/xml.js +++ b/core/xml.js @@ -15,23 +15,23 @@ */ goog.module('Blockly.Xml'); -/* eslint-disable-next-line no-unused-vars */ -const Connection = goog.requireType('Blockly.Connection'); -/* eslint-disable-next-line no-unused-vars */ -const Field = goog.requireType('Blockly.Field'); -const Size = goog.require('Blockly.utils.Size'); -/* eslint-disable-next-line no-unused-vars */ -const VariableModel = goog.requireType('Blockly.VariableModel'); -/* eslint-disable-next-line no-unused-vars */ -const Workspace = goog.requireType('Blockly.Workspace'); -/* eslint-disable-next-line no-unused-vars */ -const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); const dom = goog.require('Blockly.utils.dom'); const eventUtils = goog.require('Blockly.Events.utils'); -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'); +/* eslint-disable-next-line no-unused-vars */ +const {Connection} = goog.requireType('Blockly.Connection'); +/* eslint-disable-next-line no-unused-vars */ +const {Field} = goog.requireType('Blockly.Field'); +const {Size} = goog.require('Blockly.utils.Size'); +/* eslint-disable-next-line no-unused-vars */ +const {VariableModel} = goog.requireType('Blockly.VariableModel'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg'); +/* eslint-disable-next-line no-unused-vars */ +const {Workspace} = goog.requireType('Blockly.Workspace'); +const {inputTypes} = goog.require('Blockly.inputTypes'); goog.requireType('Blockly.Comment'); goog.requireType('Blockly.Variables'); goog.requireType('Blockly.WorkspaceComment'); @@ -418,7 +418,8 @@ exports.clearWorkspaceAndLoadFromXml = clearWorkspaceAndLoadFromXml; * @alias Blockly.Xml.domToWorkspace */ const domToWorkspace = function(xml, workspace) { - if (xml instanceof goog.module.get('Blockly.Workspace')) { + const {Workspace} = goog.module.get('Blockly.Workspace'); + if (xml instanceof Workspace) { const swap = xml; // Closure Compiler complains here because the arguments are reversed. /** @suppress {checkTypes} */ @@ -470,7 +471,7 @@ const domToWorkspace = function(xml, workspace) { throw TypeError('Shadow block cannot be a top-level block.'); } else if (name === 'comment') { if (workspace.rendered) { - const WorkspaceCommentSvg = + const {WorkspaceCommentSvg} = goog.module.get('Blockly.WorkspaceCommentSvg'); if (!WorkspaceCommentSvg) { console.warn( @@ -482,7 +483,7 @@ const domToWorkspace = function(xml, workspace) { /** @type {!WorkspaceSvg} */ (workspace), width); } } else { - const WorkspaceComment = goog.module.get('Blockly.WorkspaceComment'); + const {WorkspaceComment} = goog.module.get('Blockly.WorkspaceComment'); if (!WorkspaceComment) { console.warn( 'Missing require for Blockly.WorkspaceComment, ' + @@ -578,7 +579,8 @@ exports.appendDomToWorkspace = appendDomToWorkspace; * @alias Blockly.Xml.domToBlock */ const domToBlock = function(xmlBlock, workspace) { - if (xmlBlock instanceof goog.module.get('Blockly.Workspace')) { + const {Workspace} = goog.module.get('Blockly.Workspace'); + if (xmlBlock instanceof Workspace) { const swap = xmlBlock; // Closure Compiler complains here because the arguments are reversed. /** @suppress {checkTypes} */ diff --git a/core/zoom_controls.js b/core/zoom_controls.js index b2cbbe51d..5ff76f611 100644 --- a/core/zoom_controls.js +++ b/core/zoom_controls.js @@ -15,23 +15,23 @@ */ goog.module('Blockly.ZoomControls'); -const ComponentManager = goog.require('Blockly.ComponentManager'); const Css = goog.require('Blockly.Css'); -/* eslint-disable-next-line no-unused-vars */ -const IPositionable = goog.require('Blockly.IPositionable'); -/* eslint-disable-next-line no-unused-vars */ -const MetricsManager = goog.requireType('Blockly.MetricsManager'); -const Rect = goog.require('Blockly.utils.Rect'); -const Size = goog.require('Blockly.utils.Size'); -const Svg = goog.require('Blockly.utils.Svg'); const Touch = goog.require('Blockly.Touch'); -/* eslint-disable-next-line no-unused-vars */ -const WorkspaceSvg = goog.requireType('Blockly.WorkspaceSvg'); const browserEvents = goog.require('Blockly.browserEvents'); const dom = goog.require('Blockly.utils.dom'); const eventUtils = goog.require('Blockly.Events.utils'); const internalConstants = goog.require('Blockly.internalConstants'); const uiPosition = goog.require('Blockly.uiPosition'); +const {ComponentManager} = goog.require('Blockly.ComponentManager'); +/* eslint-disable-next-line no-unused-vars */ +const {IPositionable} = goog.require('Blockly.IPositionable'); +/* eslint-disable-next-line no-unused-vars */ +const {MetricsManager} = goog.requireType('Blockly.MetricsManager'); +const {Rect} = goog.require('Blockly.utils.Rect'); +const {Size} = goog.require('Blockly.utils.Size'); +const {Svg} = goog.require('Blockly.utils.Svg'); +/* eslint-disable-next-line no-unused-vars */ +const {WorkspaceSvg} = goog.requireType('Blockly.WorkspaceSvg'); /** @suppress {extraRequire} */ goog.require('Blockly.Events.Click'); @@ -512,4 +512,4 @@ Css.register(` } `); -exports = ZoomControls; +exports.ZoomControls = ZoomControls; diff --git a/tests/deps.js b/tests/deps.js index 0dec8d77f..a58884d2a 100644 --- a/tests/deps.js +++ b/tests/deps.js @@ -12,7 +12,7 @@ goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations'] goog.addDependency('../../core/block_drag_surface.js', ['Blockly.BlockDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/block_dragger.js', ['Blockly.BlockDragger'], ['Blockly.Events.BlockDrag', 'Blockly.Events.BlockMove', 'Blockly.Events.utils', 'Blockly.IBlockDragger', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', 'Blockly.bumpObjects', 'Blockly.common', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/block_svg.js', ['Blockly.BlockSvg'], ['Blockly.ASTNode', 'Blockly.Block', 'Blockly.ConnectionType', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events.BlockMove', 'Blockly.Events.Selected', 'Blockly.Events.utils', 'Blockly.FieldLabel', 'Blockly.IASTNodeLocationSvg', 'Blockly.IBoundedElement', 'Blockly.ICopyable', 'Blockly.IDraggable', 'Blockly.MarkerManager', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.constants', 'Blockly.internalConstants', 'Blockly.serialization.blocks', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'}); -goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ASTNode', 'Blockly.BasicCursor', 'Blockly.Block', 'Blockly.BlockDragSurfaceSvg', 'Blockly.BlockDragger', 'Blockly.BlockSvg', 'Blockly.BlocklyOptions', 'Blockly.Bubble', 'Blockly.BubbleDragger', 'Blockly.CollapsibleToolboxCategory', 'Blockly.Comment', 'Blockly.ComponentManager', 'Blockly.Connection', 'Blockly.ConnectionChecker', 'Blockly.ConnectionDB', 'Blockly.ConnectionType', 'Blockly.ContextMenu', 'Blockly.ContextMenuItems', 'Blockly.ContextMenuRegistry', 'Blockly.Css', 'Blockly.Cursor', 'Blockly.DeleteArea', 'Blockly.DragTarget', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Extensions', 'Blockly.Field', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Flyout', 'Blockly.FlyoutButton', 'Blockly.FlyoutMetricsManager', 'Blockly.Generator', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.HorizontalFlyout', 'Blockly.IASTNodeLocation', 'Blockly.IASTNodeLocationSvg', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.IAutoHideable', 'Blockly.IBlockDragger', 'Blockly.IBoundedElement', 'Blockly.IBubble', 'Blockly.ICollapsibleToolboxItem', 'Blockly.IComponent', 'Blockly.IConnectionChecker', 'Blockly.IContextMenu', 'Blockly.ICopyable', 'Blockly.IDeletable', 'Blockly.IDeleteArea', 'Blockly.IDragTarget', 'Blockly.IDraggable', 'Blockly.IFlyout', 'Blockly.IKeyboardAccessible', 'Blockly.IMetricsManager', 'Blockly.IMovable', 'Blockly.IPositionable', 'Blockly.IRegistrable', 'Blockly.IRegistrableField', 'Blockly.ISelectable', 'Blockly.ISelectableToolboxItem', 'Blockly.IStyleable', 'Blockly.IToolbox', 'Blockly.IToolboxItem', 'Blockly.Icon', 'Blockly.Input', 'Blockly.InsertionMarkerManager', 'Blockly.Marker', 'Blockly.MarkerManager', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.MetricsManager', 'Blockly.Mutator', 'Blockly.Names', 'Blockly.Options', 'Blockly.Procedures', 'Blockly.Procedures', 'Blockly.RenderedConnection', 'Blockly.Scrollbar', 'Blockly.ScrollbarPair', 'Blockly.ShortcutItems', 'Blockly.ShortcutRegistry', 'Blockly.TabNavigateCursor', 'Blockly.Theme', 'Blockly.ThemeManager', 'Blockly.Themes', 'Blockly.Toolbox', 'Blockly.ToolboxCategory', 'Blockly.ToolboxItem', 'Blockly.ToolboxSeparator', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Touch', 'Blockly.TouchGesture', 'Blockly.Trashcan', 'Blockly.VariableMap', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Variables', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceComment', 'Blockly.WorkspaceCommentSvg', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceDragger', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.Xml', 'Blockly.ZoomControls', 'Blockly.blockAnimations', 'Blockly.blockRendering', 'Blockly.blocks', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.clipboard', 'Blockly.common', 'Blockly.constants', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.geras', 'Blockly.inject', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.minimalist', 'Blockly.registry', 'Blockly.thrasos', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.global', 'Blockly.utils.toolbox', 'Blockly.zelos'], {'lang': 'es6', 'module': 'goog'}); +goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ASTNode', 'Blockly.BasicCursor', 'Blockly.Block', 'Blockly.BlockDragSurfaceSvg', 'Blockly.BlockDragger', 'Blockly.BlockSvg', 'Blockly.BlocklyOptions', 'Blockly.Bubble', 'Blockly.BubbleDragger', 'Blockly.CollapsibleToolboxCategory', 'Blockly.Comment', 'Blockly.ComponentManager', 'Blockly.Connection', 'Blockly.ConnectionChecker', 'Blockly.ConnectionDB', 'Blockly.ConnectionType', 'Blockly.ContextMenu', 'Blockly.ContextMenuItems', 'Blockly.ContextMenuRegistry', 'Blockly.Css', 'Blockly.Cursor', 'Blockly.DeleteArea', 'Blockly.DragTarget', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Extensions', 'Blockly.Field', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Flyout', 'Blockly.FlyoutButton', 'Blockly.FlyoutMetricsManager', 'Blockly.Generator', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.HorizontalFlyout', 'Blockly.IASTNodeLocation', 'Blockly.IASTNodeLocationSvg', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.IAutoHideable', 'Blockly.IBlockDragger', 'Blockly.IBoundedElement', 'Blockly.IBubble', 'Blockly.ICollapsibleToolboxItem', 'Blockly.IComponent', 'Blockly.IConnectionChecker', 'Blockly.IContextMenu', 'Blockly.ICopyable', 'Blockly.IDeletable', 'Blockly.IDeleteArea', 'Blockly.IDragTarget', 'Blockly.IDraggable', 'Blockly.IFlyout', 'Blockly.IKeyboardAccessible', 'Blockly.IMetricsManager', 'Blockly.IMovable', 'Blockly.IPositionable', 'Blockly.IRegistrable', 'Blockly.IRegistrableField', 'Blockly.ISelectable', 'Blockly.ISelectableToolboxItem', 'Blockly.IStyleable', 'Blockly.IToolbox', 'Blockly.IToolboxItem', 'Blockly.Icon', 'Blockly.Input', 'Blockly.InsertionMarkerManager', 'Blockly.Marker', 'Blockly.MarkerManager', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.MetricsManager', 'Blockly.Mutator', 'Blockly.Names', 'Blockly.Options', 'Blockly.Procedures', 'Blockly.RenderedConnection', 'Blockly.Scrollbar', 'Blockly.ScrollbarPair', 'Blockly.ShortcutItems', 'Blockly.ShortcutRegistry', 'Blockly.TabNavigateCursor', 'Blockly.Theme', 'Blockly.ThemeManager', 'Blockly.Themes', 'Blockly.Toolbox', 'Blockly.ToolboxCategory', 'Blockly.ToolboxItem', 'Blockly.ToolboxSeparator', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.TouchGesture', 'Blockly.Trashcan', 'Blockly.VariableMap', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceComment', 'Blockly.WorkspaceCommentSvg', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceDragger', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.ZoomControls', 'Blockly.blockAnimations', 'Blockly.blockRendering', 'Blockly.blocks', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.clipboard', 'Blockly.common', 'Blockly.constants', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.geras', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.minimalist', 'Blockly.registry', 'Blockly.thrasos', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.global', 'Blockly.utils.toolbox', 'Blockly.zelos'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/blockly_options.js', ['Blockly.BlocklyOptions'], [], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/blocks.js', ['Blockly.blocks'], [], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/browser_events.js', ['Blockly.browserEvents'], ['Blockly.Touch', 'Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'}); diff --git a/tests/deps.mocha.js b/tests/deps.mocha.js index 0f21b56ea..c60c29b64 100644 --- a/tests/deps.mocha.js +++ b/tests/deps.mocha.js @@ -12,7 +12,7 @@ goog.addDependency('../../core/block_animations.js', ['Blockly.blockAnimations'] goog.addDependency('../../core/block_drag_surface.js', ['Blockly.BlockDragSurfaceSvg'], ['Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/block_dragger.js', ['Blockly.BlockDragger'], ['Blockly.Events.BlockDrag', 'Blockly.Events.BlockMove', 'Blockly.Events.utils', 'Blockly.IBlockDragger', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', 'Blockly.bumpObjects', 'Blockly.common', 'Blockly.registry', 'Blockly.utils.Coordinate', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/block_svg.js', ['Blockly.BlockSvg'], ['Blockly.ASTNode', 'Blockly.Block', 'Blockly.ConnectionType', 'Blockly.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events.BlockMove', 'Blockly.Events.Selected', 'Blockly.Events.utils', 'Blockly.FieldLabel', 'Blockly.IASTNodeLocationSvg', 'Blockly.IBoundedElement', 'Blockly.ICopyable', 'Blockly.IDraggable', 'Blockly.MarkerManager', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.blockAnimations', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.constants', 'Blockly.internalConstants', 'Blockly.serialization.blocks', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'}); -goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ASTNode', 'Blockly.BasicCursor', 'Blockly.Block', 'Blockly.BlockDragSurfaceSvg', 'Blockly.BlockDragger', 'Blockly.BlockSvg', 'Blockly.BlocklyOptions', 'Blockly.Bubble', 'Blockly.BubbleDragger', 'Blockly.CollapsibleToolboxCategory', 'Blockly.Comment', 'Blockly.ComponentManager', 'Blockly.Connection', 'Blockly.ConnectionChecker', 'Blockly.ConnectionDB', 'Blockly.ConnectionType', 'Blockly.ContextMenu', 'Blockly.ContextMenuItems', 'Blockly.ContextMenuRegistry', 'Blockly.Css', 'Blockly.Cursor', 'Blockly.DeleteArea', 'Blockly.DragTarget', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Extensions', 'Blockly.Field', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Flyout', 'Blockly.FlyoutButton', 'Blockly.FlyoutMetricsManager', 'Blockly.Generator', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.HorizontalFlyout', 'Blockly.IASTNodeLocation', 'Blockly.IASTNodeLocationSvg', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.IAutoHideable', 'Blockly.IBlockDragger', 'Blockly.IBoundedElement', 'Blockly.IBubble', 'Blockly.ICollapsibleToolboxItem', 'Blockly.IComponent', 'Blockly.IConnectionChecker', 'Blockly.IContextMenu', 'Blockly.ICopyable', 'Blockly.IDeletable', 'Blockly.IDeleteArea', 'Blockly.IDragTarget', 'Blockly.IDraggable', 'Blockly.IFlyout', 'Blockly.IKeyboardAccessible', 'Blockly.IMetricsManager', 'Blockly.IMovable', 'Blockly.IPositionable', 'Blockly.IRegistrable', 'Blockly.IRegistrableField', 'Blockly.ISelectable', 'Blockly.ISelectableToolboxItem', 'Blockly.IStyleable', 'Blockly.IToolbox', 'Blockly.IToolboxItem', 'Blockly.Icon', 'Blockly.Input', 'Blockly.InsertionMarkerManager', 'Blockly.Marker', 'Blockly.MarkerManager', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.MetricsManager', 'Blockly.Mutator', 'Blockly.Names', 'Blockly.Options', 'Blockly.Procedures', 'Blockly.Procedures', 'Blockly.RenderedConnection', 'Blockly.Scrollbar', 'Blockly.ScrollbarPair', 'Blockly.ShortcutItems', 'Blockly.ShortcutRegistry', 'Blockly.TabNavigateCursor', 'Blockly.Theme', 'Blockly.ThemeManager', 'Blockly.Themes', 'Blockly.Toolbox', 'Blockly.ToolboxCategory', 'Blockly.ToolboxItem', 'Blockly.ToolboxSeparator', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Touch', 'Blockly.TouchGesture', 'Blockly.Trashcan', 'Blockly.VariableMap', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.Variables', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceComment', 'Blockly.WorkspaceCommentSvg', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceDragger', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.Xml', 'Blockly.ZoomControls', 'Blockly.blockAnimations', 'Blockly.blockRendering', 'Blockly.blocks', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.clipboard', 'Blockly.common', 'Blockly.constants', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.geras', 'Blockly.inject', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.minimalist', 'Blockly.registry', 'Blockly.thrasos', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.global', 'Blockly.utils.toolbox', 'Blockly.zelos'], {'lang': 'es6', 'module': 'goog'}); +goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ASTNode', 'Blockly.BasicCursor', 'Blockly.Block', 'Blockly.BlockDragSurfaceSvg', 'Blockly.BlockDragger', 'Blockly.BlockSvg', 'Blockly.BlocklyOptions', 'Blockly.Bubble', 'Blockly.BubbleDragger', 'Blockly.CollapsibleToolboxCategory', 'Blockly.Comment', 'Blockly.ComponentManager', 'Blockly.Connection', 'Blockly.ConnectionChecker', 'Blockly.ConnectionDB', 'Blockly.ConnectionType', 'Blockly.ContextMenu', 'Blockly.ContextMenuItems', 'Blockly.ContextMenuRegistry', 'Blockly.Css', 'Blockly.Cursor', 'Blockly.DeleteArea', 'Blockly.DragTarget', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Extensions', 'Blockly.Field', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.Flyout', 'Blockly.FlyoutButton', 'Blockly.FlyoutMetricsManager', 'Blockly.Generator', 'Blockly.Gesture', 'Blockly.Grid', 'Blockly.HorizontalFlyout', 'Blockly.IASTNodeLocation', 'Blockly.IASTNodeLocationSvg', 'Blockly.IASTNodeLocationWithBlock', 'Blockly.IAutoHideable', 'Blockly.IBlockDragger', 'Blockly.IBoundedElement', 'Blockly.IBubble', 'Blockly.ICollapsibleToolboxItem', 'Blockly.IComponent', 'Blockly.IConnectionChecker', 'Blockly.IContextMenu', 'Blockly.ICopyable', 'Blockly.IDeletable', 'Blockly.IDeleteArea', 'Blockly.IDragTarget', 'Blockly.IDraggable', 'Blockly.IFlyout', 'Blockly.IKeyboardAccessible', 'Blockly.IMetricsManager', 'Blockly.IMovable', 'Blockly.IPositionable', 'Blockly.IRegistrable', 'Blockly.IRegistrableField', 'Blockly.ISelectable', 'Blockly.ISelectableToolboxItem', 'Blockly.IStyleable', 'Blockly.IToolbox', 'Blockly.IToolboxItem', 'Blockly.Icon', 'Blockly.Input', 'Blockly.InsertionMarkerManager', 'Blockly.Marker', 'Blockly.MarkerManager', 'Blockly.Menu', 'Blockly.MenuItem', 'Blockly.MetricsManager', 'Blockly.Mutator', 'Blockly.Names', 'Blockly.Options', 'Blockly.Procedures', 'Blockly.RenderedConnection', 'Blockly.Scrollbar', 'Blockly.ScrollbarPair', 'Blockly.ShortcutItems', 'Blockly.ShortcutRegistry', 'Blockly.TabNavigateCursor', 'Blockly.Theme', 'Blockly.ThemeManager', 'Blockly.Themes', 'Blockly.Toolbox', 'Blockly.ToolboxCategory', 'Blockly.ToolboxItem', 'Blockly.ToolboxSeparator', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.TouchGesture', 'Blockly.Trashcan', 'Blockly.VariableMap', 'Blockly.VariableModel', 'Blockly.Variables', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.WidgetDiv', 'Blockly.Workspace', 'Blockly.WorkspaceAudio', 'Blockly.WorkspaceComment', 'Blockly.WorkspaceCommentSvg', 'Blockly.WorkspaceDragSurfaceSvg', 'Blockly.WorkspaceDragger', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.ZoomControls', 'Blockly.blockAnimations', 'Blockly.blockRendering', 'Blockly.blocks', 'Blockly.browserEvents', 'Blockly.bumpObjects', 'Blockly.clipboard', 'Blockly.common', 'Blockly.constants', 'Blockly.dialog', 'Blockly.fieldRegistry', 'Blockly.geras', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.minimalist', 'Blockly.registry', 'Blockly.thrasos', 'Blockly.uiPosition', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.global', 'Blockly.utils.toolbox', 'Blockly.zelos'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/blockly_options.js', ['Blockly.BlocklyOptions'], [], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/blocks.js', ['Blockly.blocks'], [], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/browser_events.js', ['Blockly.browserEvents'], ['Blockly.Touch', 'Blockly.internalConstants', 'Blockly.utils.global', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'}); diff --git a/tests/mocha/test_helpers.js b/tests/mocha/test_helpers.js index 7f4245070..7d1fe8aca 100644 --- a/tests/mocha/test_helpers.js +++ b/tests/mocha/test_helpers.js @@ -6,7 +6,7 @@ goog.module('Blockly.test.helpers'); -const KeyCodes = goog.require('Blockly.utils.KeyCodes'); +const {KeyCodes} = goog.require('Blockly.utils.KeyCodes'); const eventUtils = goog.require('Blockly.Events.utils'); const {Blocks} = goog.require('Blockly.blocks'); diff --git a/tests/scripts/check_metadata.sh b/tests/scripts/check_metadata.sh index b716d0063..02195205c 100755 --- a/tests/scripts/check_metadata.sh +++ b/tests/scripts/check_metadata.sh @@ -27,7 +27,8 @@ readonly BUILD_DIR='build' # Q2 2021 6.20210701.0 664497 # Q3 2021 6.20210701.0 731695 (mid-quarter goog.module conversion) # Q3 2021 6.20210701.0 808807 (late-quarter goog.module conversion) -readonly BLOCKLY_SIZE_EXPECTED=808807 +# Q4 2021 7.20211209.0-beta.0 920002 +readonly BLOCKLY_SIZE_EXPECTED=920002 # Size of blocks_compressed.js # Q2 2019 2.20190722.0 75618 @@ -40,7 +41,8 @@ readonly BLOCKLY_SIZE_EXPECTED=808807 # Q1 2021 5.20210325.0 76693 # Q2 2021 6.20210701.0 76669 # Q3 2021 6.20210701.0 76669 -readonly BLOCKS_SIZE_EXPECTED=76669 +# Q4 2021 7.20211209.0-beta.0 82054 +readonly BLOCKS_SIZE_EXPECTED=82054 # Size of blockly_compressed.js.gz # Q2 2019 2.20190722.0 180925 @@ -54,7 +56,8 @@ readonly BLOCKS_SIZE_EXPECTED=76669 # Q2 2021 6.20210701.0 142112 # Q3 2021 6.20210701.0 147476 (mid-quarter goog.module conversion) # Q3 2021 6.20210701.0 152025 (late-quarter goog.module conversion) -readonly BLOCKLY_GZ_SIZE_EXPECTED=152025 +# Q4 2021 7.20211209.0-beta.0 169863 +readonly BLOCKLY_GZ_SIZE_EXPECTED=169863 # Size of blocks_compressed.js.gz # Q2 2019 2.20190722.0 14552 @@ -67,7 +70,8 @@ readonly BLOCKLY_GZ_SIZE_EXPECTED=152025 # Q1 2021 5.20210325.0 15285 # Q2 2021 6.20210701.0 15275 # Q3 2021 6.20210701.0 15284 -readonly BLOCKS_GZ_SIZE_EXPECTED=15284 +# Q4 2021 7.20211209.0-beta.0 16616 +readonly BLOCKS_GZ_SIZE_EXPECTED=16616 # ANSI colors readonly BOLD_GREEN='\033[1;32m'