From ef0fcdbcdd7c3b9389a34c76e1bf0508f51b2757 Mon Sep 17 00:00:00 2001 From: kozbial Date: Mon, 2 Aug 2021 12:38:01 -0700 Subject: [PATCH] Split Blockly.BlocklyOptions into a separate file --- core/blockly_options.js | 21 +++++++++++++++++++++ core/inject.js | 1 + core/mutator.js | 6 +++--- core/options.js | 9 +-------- core/toolbox/toolbox.js | 1 + core/trashcan.js | 4 ++-- core/workspace.js | 1 + core/workspace_svg.js | 1 + tests/deps.js | 1 + 9 files changed, 32 insertions(+), 13 deletions(-) create mode 100644 core/blockly_options.js diff --git a/core/blockly_options.js b/core/blockly_options.js new file mode 100644 index 000000000..d2964385f --- /dev/null +++ b/core/blockly_options.js @@ -0,0 +1,21 @@ +/** + * @license + * Copyright 2016 Google LLC + * SPDX-License-Identifier: Apache-2.0 + */ + +/** + * @fileoverview Object that defines user-specified options for the workspace. + * @author fenichel@google.com (Rachel Fenichel) + */ +'use strict'; + +goog.provide('Blockly.BlocklyOptions'); + +/** + * Blockly options. + * This interface is further described in + * `typings/parts/blockly-interfaces.d.ts`. + * @interface + */ +Blockly.BlocklyOptions = function() {}; diff --git a/core/inject.js b/core/inject.js index 3b3715b0f..a1bdffbe1 100644 --- a/core/inject.js +++ b/core/inject.js @@ -34,6 +34,7 @@ goog.require('Blockly.WorkspaceDragSurfaceSvg'); goog.require('Blockly.WorkspaceSvg'); goog.require('Blockly.WidgetDiv'); +goog.requireType('Blockly.BlocklyOptions'); goog.requireType('Blockly.BlockSvg'); diff --git a/core/mutator.js b/core/mutator.js index 8f9bab118..5f7189fcd 100644 --- a/core/mutator.js +++ b/core/mutator.js @@ -19,9 +19,9 @@ const Abstract = goog.requireType('Blockly.Events.Abstract'); /* eslint-disable-next-line no-unused-vars */ const Block = goog.requireType('Blockly.Block'); /* eslint-disable-next-line no-unused-vars */ -const BlockSvg = goog.requireType('Blockly.BlockSvg'); +const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions'); /* eslint-disable-next-line no-unused-vars */ -const Blockly = goog.requireType('Blockly'); +const BlockSvg = goog.requireType('Blockly.BlockSvg'); const Bubble = goog.require('Blockly.Bubble'); /* eslint-disable-next-line no-unused-vars */ const Connection = goog.requireType('Blockly.Connection'); @@ -170,7 +170,7 @@ Mutator.prototype.createEditor_ = function() { quarkXml = null; } const workspaceOptions = new Options( - /** @type {!Blockly.BlocklyOptions} */ + /** @type {!BlocklyOptions} */ ({ // If you want to enable disabling, also remove the // event filter from workspaceChanged_ . diff --git a/core/options.js b/core/options.js index 58c4e378a..fbb4cfd1e 100644 --- a/core/options.js +++ b/core/options.js @@ -19,6 +19,7 @@ goog.require('Blockly.utils.IdGenerator'); goog.require('Blockly.utils.Metrics'); goog.require('Blockly.utils.toolbox'); +goog.requireType('Blockly.BlocklyOptions'); goog.requireType('Blockly.WorkspaceSvg'); @@ -180,14 +181,6 @@ Blockly.Options = function(options) { this.plugins = plugins; }; -/** - * Blockly options. - * This interface is further described in - * `typings/parts/blockly-interfaces.d.ts`. - * @interface - */ -Blockly.BlocklyOptions = function() {}; - /** * Grid Options. * @typedef {{ diff --git a/core/toolbox/toolbox.js b/core/toolbox/toolbox.js index a2e76ef70..826482eaf 100644 --- a/core/toolbox/toolbox.js +++ b/core/toolbox/toolbox.js @@ -36,6 +36,7 @@ goog.require('Blockly.utils.dom'); goog.require('Blockly.utils.Rect'); goog.require('Blockly.utils.toolbox'); +goog.requireType('Blockly.BlocklyOptions'); goog.requireType('Blockly.ICollapsibleToolboxItem'); goog.requireType('Blockly.IDraggable'); goog.requireType('Blockly.IFlyout'); diff --git a/core/trashcan.js b/core/trashcan.js index fb60ca3a1..7e60d841d 100644 --- a/core/trashcan.js +++ b/core/trashcan.js @@ -16,7 +16,7 @@ goog.module.declareLegacyNamespace(); /* eslint-disable-next-line no-unused-vars */ const Abstract = goog.requireType('Blockly.Events.Abstract'); /* eslint-disable-next-line no-unused-vars */ -const Blockly = goog.requireType('Blockly'); +const BlocklyOptions = goog.requireType('Blockly.BlocklyOptions'); const ComponentManager = goog.require('Blockly.ComponentManager'); const DeleteArea = goog.require('Blockly.DeleteArea'); const Events = goog.require('Blockly.Events'); @@ -90,7 +90,7 @@ const Trashcan = function(workspace) { } // Create flyout options. const flyoutWorkspaceOptions = new Options( - /** @type {!Blockly.BlocklyOptions} */ + /** @type {!BlocklyOptions} */ ({ 'scrollbars': true, 'parentWorkspace': this.workspace_, diff --git a/core/workspace.js b/core/workspace.js index 9a1dd8cbb..4c35f5b83 100644 --- a/core/workspace.js +++ b/core/workspace.js @@ -23,6 +23,7 @@ goog.require('Blockly.utils.math'); goog.require('Blockly.VariableMap'); goog.requireType('Blockly.Block'); +goog.requireType('Blockly.BlocklyOptions'); goog.requireType('Blockly.ConnectionDB'); goog.requireType('Blockly.Events.Abstract'); goog.requireType('Blockly.IConnectionChecker'); diff --git a/core/workspace_svg.js b/core/workspace_svg.js index 81536d5e6..e4aa50229 100644 --- a/core/workspace_svg.js +++ b/core/workspace_svg.js @@ -57,6 +57,7 @@ goog.require('Blockly.Xml'); goog.requireType('Blockly.Block'); goog.requireType('Blockly.BlockDragSurfaceSvg'); +goog.requireType('Blockly.BlocklyOptions'); goog.requireType('Blockly.blockRendering.Renderer'); goog.requireType('Blockly.Cursor'); goog.requireType('Blockly.FlyoutButton'); diff --git a/tests/deps.js b/tests/deps.js index fb30bbb2b..40c6a7e40 100644 --- a/tests/deps.js +++ b/tests/deps.js @@ -13,6 +13,7 @@ goog.addDependency('../../core/block_drag_surface.js', ['Blockly.BlockDragSurfac goog.addDependency('../../core/block_dragger.js', ['Blockly.BlockDragger'], ['Blockly.Events', 'Blockly.Events.BlockDrag', 'Blockly.Events.BlockMove', 'Blockly.IBlockDragger', 'Blockly.InsertionMarkerManager', 'Blockly.blockAnimations', '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.ContextMenu', 'Blockly.ContextMenuRegistry', 'Blockly.Events', 'Blockly.Events.BlockMove', 'Blockly.Events.Selected', 'Blockly.IASTNodeLocationSvg', 'Blockly.IBoundedElement', 'Blockly.ICopyable', 'Blockly.IDraggable', 'Blockly.Msg', 'Blockly.RenderedConnection', 'Blockly.TabNavigateCursor', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Xml', 'Blockly.blockAnimations', 'Blockly.blockRendering.IPathObject', 'Blockly.browserEvents', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Rect', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.userAgent'], {'lang': 'es6'}); goog.addDependency('../../core/blockly.js', ['Blockly'], ['Blockly.ComponentManager', 'Blockly.DropDownDiv', 'Blockly.Events', 'Blockly.Events.BlockCreate', 'Blockly.Events.FinishedLoading', 'Blockly.Events.Ui', 'Blockly.Events.UiBase', 'Blockly.Events.VarCreate', 'Blockly.Procedures', 'Blockly.ShortcutRegistry', 'Blockly.Tooltip', 'Blockly.Touch', 'Blockly.Variables', 'Blockly.WidgetDiv', 'Blockly.WorkspaceSvg', 'Blockly.Xml', 'Blockly.browserEvents', 'Blockly.clipboard', 'Blockly.common', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.inject', 'Blockly.inputTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Size', 'Blockly.utils.colour', 'Blockly.utils.deprecation', 'Blockly.utils.toolbox']); +goog.addDependency('../../core/blockly_options.js', ['Blockly.BlocklyOptions'], []); goog.addDependency('../../core/blocks.js', ['Blockly.Blocks'], [], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/browser_events.js', ['Blockly.browserEvents'], ['Blockly.Touch', 'Blockly.utils.global'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/bubble.js', ['Blockly.Bubble'], ['Blockly.IBubble', 'Blockly.Scrollbar', 'Blockly.Touch', 'Blockly.Workspace', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Size', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.math', 'Blockly.utils.userAgent']);