From 26d2b51681db19be40cd1dcc07bf1799cc6fc81d Mon Sep 17 00:00:00 2001 From: Rachel Fenichel Date: Wed, 17 Feb 2021 11:17:48 -0800 Subject: [PATCH] Fix missing require types --- core/extensions.js | 2 ++ core/field.js | 5 +++++ core/field_registry.js | 1 + core/field_textinput.js | 3 +++ core/field_variable.js | 3 +++ core/flyout_base.js | 4 ++++ core/flyout_button.js | 3 +++ core/flyout_horizontal.js | 5 ++++- core/flyout_vertical.js | 4 +++- 9 files changed, 28 insertions(+), 2 deletions(-) diff --git a/core/extensions.js b/core/extensions.js index df76c6f91..267d172e7 100644 --- a/core/extensions.js +++ b/core/extensions.js @@ -21,6 +21,8 @@ goog.provide('Blockly.Extensions'); goog.require('Blockly.utils'); +goog.requireType('Blockly.Block'); + /** * The set of all registered extensions, keyed by extension name/id. diff --git a/core/field.js b/core/field.js index 94f4a18fc..8f450ccc8 100644 --- a/core/field.js +++ b/core/field.js @@ -26,12 +26,17 @@ goog.require('Blockly.utils.style'); goog.require('Blockly.utils.Svg'); goog.require('Blockly.utils.userAgent'); +goog.requireType('Blockly.Block'); goog.requireType('Blockly.blockRendering.ConstantProvider'); +goog.requireType('Blockly.BlockSvg'); goog.requireType('Blockly.IASTNodeLocationSvg'); goog.requireType('Blockly.IASTNodeLocationWithBlock'); goog.requireType('Blockly.IKeyboardAccessible'); +goog.requireType('Blockly.Input'); goog.requireType('Blockly.IRegistrable'); goog.requireType('Blockly.ShortcutRegistry'); +goog.requireType('Blockly.utils.Coordinate'); +goog.requireType('Blockly.WorkspaceSvg'); /** diff --git a/core/field_registry.js b/core/field_registry.js index 1a032731d..cf30979c8 100644 --- a/core/field_registry.js +++ b/core/field_registry.js @@ -16,6 +16,7 @@ goog.provide('Blockly.fieldRegistry'); goog.require('Blockly.registry'); +goog.requireType('Blockly.Field'); goog.requireType('Blockly.IRegistrableField'); diff --git a/core/field_textinput.js b/core/field_textinput.js index 9c7499723..cd871f3ce 100644 --- a/core/field_textinput.js +++ b/core/field_textinput.js @@ -26,6 +26,9 @@ goog.require('Blockly.utils.object'); goog.require('Blockly.utils.Size'); goog.require('Blockly.utils.userAgent'); +goog.requireType('Blockly.BlockSvg'); +goog.requireType('Blockly.WorkspaceSvg'); + /** * Class for an editable text field. diff --git a/core/field_variable.js b/core/field_variable.js index 352d59dec..2ec4c0383 100644 --- a/core/field_variable.js +++ b/core/field_variable.js @@ -25,6 +25,9 @@ goog.require('Blockly.VariableModel'); goog.require('Blockly.Variables'); goog.require('Blockly.Xml'); +goog.requireType('Blockly.Block'); +goog.requireType('Blockly.Menu'); +goog.requireType('Blockly.MenuItem'); /** diff --git a/core/flyout_base.js b/core/flyout_base.js index 8b4877521..06dcca4d0 100644 --- a/core/flyout_base.js +++ b/core/flyout_base.js @@ -30,10 +30,14 @@ goog.require('Blockly.utils.toolbox'); goog.require('Blockly.WorkspaceSvg'); goog.require('Blockly.Xml'); +goog.requireType('Blockly.BlockSvg'); +goog.requireType('Blockly.FlyoutButton'); goog.requireType('Blockly.IDeleteArea'); goog.requireType('Blockly.IFlyout'); +goog.requireType('Blockly.Options'); goog.requireType('Blockly.ShortcutRegistry'); goog.requireType('Blockly.utils.Metrics'); +goog.requireType('Blockly.utils.Rect'); /** diff --git a/core/flyout_button.js b/core/flyout_button.js index f0a154291..00e63b99d 100644 --- a/core/flyout_button.js +++ b/core/flyout_button.js @@ -18,6 +18,9 @@ goog.require('Blockly.utils.Coordinate'); goog.require('Blockly.utils.dom'); goog.require('Blockly.utils.Svg'); +goog.requireType('Blockly.utils.toolbox'); +goog.requireType('Blockly.WorkspaceSvg'); + /** * Class for a button in the flyout. diff --git a/core/flyout_horizontal.js b/core/flyout_horizontal.js index fbd3612ce..82c9ae81f 100644 --- a/core/flyout_horizontal.js +++ b/core/flyout_horizontal.js @@ -22,7 +22,10 @@ goog.require('Blockly.utils.object'); goog.require('Blockly.utils.Rect'); goog.require('Blockly.WidgetDiv'); +goog.requireType('Blockly.Options'); +goog.requireType('Blockly.utils.Coordinate'); goog.requireType('Blockly.utils.Metrics'); +goog.requireType('Blockly.WorkspaceSvg'); /** @@ -195,7 +198,7 @@ Blockly.HorizontalFlyout.prototype.position = function() { var x = this.getX(); var y = this.getY(); - + this.positionAt_(this.width_, this.height_, x, y); }; diff --git a/core/flyout_vertical.js b/core/flyout_vertical.js index b3812ef1c..2f6f3ee04 100644 --- a/core/flyout_vertical.js +++ b/core/flyout_vertical.js @@ -23,6 +23,8 @@ goog.require('Blockly.utils.Rect'); goog.require('Blockly.utils.userAgent'); goog.require('Blockly.WidgetDiv'); +goog.requireType('Blockly.Options'); +goog.requireType('Blockly.utils.Coordinate'); goog.requireType('Blockly.utils.Metrics'); @@ -199,7 +201,7 @@ Blockly.VerticalFlyout.prototype.position = function() { var x = this.getX(); var y = this.getY(); - + this.positionAt_(this.width_, this.height_, x, y); };