From 284b79407e84aa78e387b68ffff7ea0b4126960a Mon Sep 17 00:00:00 2001 From: Neil Fraser Date: Thu, 28 Jun 2018 15:56:24 -0700 Subject: [PATCH] Require Blockly.utils where needed. --- core/block_animations.js | 2 ++ core/bubble_dragger.js | 1 + core/comment.js | 2 ++ core/events.js | 2 ++ core/field.js | 1 + core/field_angle.js | 2 ++ core/field_checkbox.js | 1 + core/field_image.js | 2 ++ core/field_label.js | 2 ++ core/field_textinput.js | 2 ++ core/field_variable.js | 1 + core/flyout_base.js | 2 ++ core/flyout_button.js | 2 ++ core/flyout_vertical.js | 2 +- core/gesture.js | 1 + core/icon.js | 2 ++ core/inject.js | 2 ++ core/mutator.js | 2 ++ core/rendered_connection.js | 1 + core/scrollbar.js | 2 ++ core/toolbox.js | 2 ++ core/tooltip.js | 2 ++ core/touch.js | 2 ++ core/touch_gesture.js | 1 + core/trashcan.js | 2 ++ core/variable_map.js | 2 ++ core/variable_model.js | 1 + core/warning.js | 1 + core/workspace_comment.js | 2 +- core/workspace_comment_render_svg.js | 1 + core/workspace_comment_svg.js | 1 + core/zoom_controls.js | 2 ++ 32 files changed, 51 insertions(+), 2 deletions(-) diff --git a/core/block_animations.js b/core/block_animations.js index 63031d515..8c97107ce 100644 --- a/core/block_animations.js +++ b/core/block_animations.js @@ -26,6 +26,8 @@ goog.provide('Blockly.BlockAnimations'); +goog.require('Blockly.utils'); + /** * PID of disconnect UI animation. There can only be one at a time. diff --git a/core/bubble_dragger.js b/core/bubble_dragger.js index 38c8de487..26f5282c6 100644 --- a/core/bubble_dragger.js +++ b/core/bubble_dragger.js @@ -28,6 +28,7 @@ goog.provide('Blockly.BubbleDragger'); goog.require('Blockly.Bubble'); goog.require('Blockly.Events.CommentMove'); +goog.require('Blockly.utils'); goog.require('Blockly.WorkspaceCommentSvg'); goog.require('goog.math.Coordinate'); diff --git a/core/comment.js b/core/comment.js index 566923430..3b16f1782 100644 --- a/core/comment.js +++ b/core/comment.js @@ -30,6 +30,8 @@ goog.require('Blockly.Bubble'); goog.require('Blockly.Events.BlockChange'); goog.require('Blockly.Events.Ui'); goog.require('Blockly.Icon'); +goog.require('Blockly.utils'); + goog.require('goog.userAgent'); diff --git a/core/events.js b/core/events.js index da4cbd3c7..6a807f5e6 100644 --- a/core/events.js +++ b/core/events.js @@ -30,6 +30,8 @@ */ goog.provide('Blockly.Events'); +goog.require('Blockly.utils'); + goog.require('goog.math.Coordinate'); diff --git a/core/field.js b/core/field.js index 247113c3c..bd9f46246 100644 --- a/core/field.js +++ b/core/field.js @@ -30,6 +30,7 @@ goog.provide('Blockly.Field'); goog.require('Blockly.Events.BlockChange'); goog.require('Blockly.Gesture'); +goog.require('Blockly.utils'); goog.require('goog.dom'); goog.require('goog.math.Size'); diff --git a/core/field_angle.js b/core/field_angle.js index 581860484..a4ef08a2f 100644 --- a/core/field_angle.js +++ b/core/field_angle.js @@ -27,6 +27,8 @@ goog.provide('Blockly.FieldAngle'); goog.require('Blockly.FieldTextInput'); +goog.require('Blockly.utils'); + goog.require('goog.userAgent'); diff --git a/core/field_checkbox.js b/core/field_checkbox.js index 74930ec4a..7d17028f5 100644 --- a/core/field_checkbox.js +++ b/core/field_checkbox.js @@ -27,6 +27,7 @@ goog.provide('Blockly.FieldCheckbox'); goog.require('Blockly.Field'); +goog.require('Blockly.utils'); /** diff --git a/core/field_image.js b/core/field_image.js index b41e5ca91..6027b14c4 100644 --- a/core/field_image.js +++ b/core/field_image.js @@ -27,6 +27,8 @@ goog.provide('Blockly.FieldImage'); goog.require('Blockly.Field'); +goog.require('Blockly.utils'); + goog.require('goog.dom'); goog.require('goog.math.Size'); diff --git a/core/field_label.js b/core/field_label.js index fe603e576..ca195b3af 100644 --- a/core/field_label.js +++ b/core/field_label.js @@ -28,6 +28,8 @@ goog.provide('Blockly.FieldLabel'); goog.require('Blockly.Field'); goog.require('Blockly.Tooltip'); +goog.require('Blockly.utils'); + goog.require('goog.dom'); goog.require('goog.math.Size'); diff --git a/core/field_textinput.js b/core/field_textinput.js index 6ccb643f8..87d1c6ac9 100644 --- a/core/field_textinput.js +++ b/core/field_textinput.js @@ -28,6 +28,8 @@ goog.provide('Blockly.FieldTextInput'); goog.require('Blockly.Field'); goog.require('Blockly.Msg'); +goog.require('Blockly.utils'); + goog.require('goog.dom'); goog.require('goog.userAgent'); diff --git a/core/field_variable.js b/core/field_variable.js index b742ff1d9..712706d0a 100644 --- a/core/field_variable.js +++ b/core/field_variable.js @@ -28,6 +28,7 @@ goog.provide('Blockly.FieldVariable'); goog.require('Blockly.FieldDropdown'); goog.require('Blockly.Msg'); +goog.require('Blockly.utils'); goog.require('Blockly.VariableModel'); goog.require('Blockly.Variables'); diff --git a/core/flyout_base.js b/core/flyout_base.js index 3647339df..e4e4688cb 100644 --- a/core/flyout_base.js +++ b/core/flyout_base.js @@ -33,7 +33,9 @@ goog.require('Blockly.Events.VarCreate'); goog.require('Blockly.FlyoutButton'); goog.require('Blockly.Gesture'); goog.require('Blockly.Touch'); +goog.require('Blockly.utils'); goog.require('Blockly.WorkspaceSvg'); + goog.require('goog.dom'); goog.require('goog.events'); goog.require('goog.math.Rect'); diff --git a/core/flyout_button.js b/core/flyout_button.js index 290b76a0d..6fad650b5 100644 --- a/core/flyout_button.js +++ b/core/flyout_button.js @@ -26,6 +26,8 @@ goog.provide('Blockly.FlyoutButton'); +goog.require('Blockly.utils'); + goog.require('goog.dom'); goog.require('goog.math.Coordinate'); diff --git a/core/flyout_vertical.js b/core/flyout_vertical.js index 1ab3fbb40..ec964c767 100644 --- a/core/flyout_vertical.js +++ b/core/flyout_vertical.js @@ -30,8 +30,8 @@ goog.require('Blockly.Block'); goog.require('Blockly.Events'); goog.require('Blockly.Flyout'); goog.require('Blockly.FlyoutButton'); -goog.require('Blockly.utils'); goog.require('Blockly.WorkspaceSvg'); + goog.require('goog.dom'); goog.require('goog.events'); goog.require('goog.math.Rect'); diff --git a/core/gesture.js b/core/gesture.js index 7fe357a4b..bb2070ce6 100644 --- a/core/gesture.js +++ b/core/gesture.js @@ -35,6 +35,7 @@ goog.require('Blockly.Events.Ui'); goog.require('Blockly.FlyoutDragger'); goog.require('Blockly.Tooltip'); goog.require('Blockly.Touch'); +goog.require('Blockly.utils'); goog.require('Blockly.WorkspaceDragger'); goog.require('goog.math.Coordinate'); diff --git a/core/icon.js b/core/icon.js index b51d90efd..fcc379c35 100644 --- a/core/icon.js +++ b/core/icon.js @@ -26,6 +26,8 @@ goog.provide('Blockly.Icon'); +goog.require('Blockly.utils'); + goog.require('goog.dom'); goog.require('goog.math.Coordinate'); diff --git a/core/inject.js b/core/inject.js index 0e8e944a5..f88434762 100644 --- a/core/inject.js +++ b/core/inject.js @@ -30,8 +30,10 @@ goog.require('Blockly.BlockDragSurfaceSvg'); goog.require('Blockly.Css'); goog.require('Blockly.Grid'); goog.require('Blockly.Options'); +goog.require('Blockly.utils'); goog.require('Blockly.WorkspaceSvg'); goog.require('Blockly.WorkspaceDragSurfaceSvg'); + goog.require('goog.dom'); goog.require('goog.ui.Component'); goog.require('goog.userAgent'); diff --git a/core/mutator.js b/core/mutator.js index b40680386..1aedae875 100644 --- a/core/mutator.js +++ b/core/mutator.js @@ -31,7 +31,9 @@ goog.require('Blockly.Bubble'); goog.require('Blockly.Events.BlockChange'); goog.require('Blockly.Events.Ui'); goog.require('Blockly.Icon'); +goog.require('Blockly.utils'); goog.require('Blockly.WorkspaceSvg'); + goog.require('goog.dom'); diff --git a/core/rendered_connection.js b/core/rendered_connection.js index bdf60513f..f5e8ef5c9 100644 --- a/core/rendered_connection.js +++ b/core/rendered_connection.js @@ -27,6 +27,7 @@ goog.provide('Blockly.RenderedConnection'); goog.require('Blockly.Connection'); +goog.require('Blockly.utils'); /** diff --git a/core/scrollbar.js b/core/scrollbar.js index bbaff04cf..7597ba5a1 100644 --- a/core/scrollbar.js +++ b/core/scrollbar.js @@ -27,6 +27,8 @@ goog.provide('Blockly.Scrollbar'); goog.provide('Blockly.ScrollbarPair'); +goog.require('Blockly.utils'); + goog.require('goog.dom'); goog.require('goog.events'); diff --git a/core/toolbox.js b/core/toolbox.js index 000e8b968..b87929a6b 100644 --- a/core/toolbox.js +++ b/core/toolbox.js @@ -30,7 +30,9 @@ goog.require('Blockly.Events.Ui'); goog.require('Blockly.Flyout'); goog.require('Blockly.HorizontalFlyout'); goog.require('Blockly.Touch'); +goog.require('Blockly.utils'); goog.require('Blockly.VerticalFlyout'); + goog.require('goog.dom'); goog.require('goog.events'); goog.require('goog.events.BrowserFeature'); diff --git a/core/tooltip.js b/core/tooltip.js index 891571256..f93f3ae38 100644 --- a/core/tooltip.js +++ b/core/tooltip.js @@ -35,6 +35,8 @@ **/ goog.provide('Blockly.Tooltip'); +goog.require('Blockly.utils'); + goog.require('goog.dom'); diff --git a/core/touch.js b/core/touch.js index 85c704302..f7d6216ce 100644 --- a/core/touch.js +++ b/core/touch.js @@ -30,6 +30,8 @@ **/ goog.provide('Blockly.Touch'); +goog.require('Blockly.utils'); + goog.require('goog.events'); goog.require('goog.events.BrowserFeature'); diff --git a/core/touch_gesture.js b/core/touch_gesture.js index ce0df947c..8b5f56815 100644 --- a/core/touch_gesture.js +++ b/core/touch_gesture.js @@ -28,6 +28,7 @@ goog.provide('Blockly.TouchGesture'); goog.require('Blockly.Gesture'); +goog.require('Blockly.utils'); goog.require('goog.math.Coordinate'); diff --git a/core/trashcan.js b/core/trashcan.js index a93413118..8580d0a38 100644 --- a/core/trashcan.js +++ b/core/trashcan.js @@ -26,6 +26,8 @@ goog.provide('Blockly.Trashcan'); +goog.require('Blockly.utils'); + goog.require('goog.dom'); goog.require('goog.math'); goog.require('goog.math.Rect'); diff --git a/core/variable_map.js b/core/variable_map.js index f243b0358..963ad5f8c 100644 --- a/core/variable_map.js +++ b/core/variable_map.js @@ -28,6 +28,8 @@ goog.provide('Blockly.VariableMap'); goog.require('Blockly.Events.VarDelete'); goog.require('Blockly.Events.VarRename'); +goog.require('Blockly.utils'); + /** * Class for a variable map. This contains a dictionary data structure with diff --git a/core/variable_model.js b/core/variable_model.js index a047b18e7..f2eb1c742 100644 --- a/core/variable_model.js +++ b/core/variable_model.js @@ -27,6 +27,7 @@ goog.provide('Blockly.VariableModel'); goog.require('Blockly.Events.VarCreate'); +goog.require('Blockly.utils'); /** diff --git a/core/warning.js b/core/warning.js index 147f57f55..9ae3c7ea0 100644 --- a/core/warning.js +++ b/core/warning.js @@ -29,6 +29,7 @@ goog.provide('Blockly.Warning'); goog.require('Blockly.Bubble'); goog.require('Blockly.Events.Ui'); goog.require('Blockly.Icon'); +goog.require('Blockly.utils'); /** diff --git a/core/workspace_comment.js b/core/workspace_comment.js index 7067795b4..4ebd95f08 100644 --- a/core/workspace_comment.js +++ b/core/workspace_comment.js @@ -30,6 +30,7 @@ goog.require('Blockly.Events.CommentChange'); goog.require('Blockly.Events.CommentCreate'); goog.require('Blockly.Events.CommentDelete'); goog.require('Blockly.Events.CommentMove'); +goog.require('Blockly.utils'); goog.require('goog.math.Coordinate'); @@ -360,4 +361,3 @@ Blockly.WorkspaceComment.parseAttributes = function(xml) { content: xml.textContent }; }; - diff --git a/core/workspace_comment_render_svg.js b/core/workspace_comment_render_svg.js index 1a8dcbbe9..c0ee314a5 100644 --- a/core/workspace_comment_render_svg.js +++ b/core/workspace_comment_render_svg.js @@ -26,6 +26,7 @@ goog.provide('Blockly.WorkspaceCommentSvg.render'); +goog.require('Blockly.utils'); goog.require('Blockly.WorkspaceCommentSvg'); diff --git a/core/workspace_comment_svg.js b/core/workspace_comment_svg.js index 8acf3ee08..ba6b9bec5 100644 --- a/core/workspace_comment_svg.js +++ b/core/workspace_comment_svg.js @@ -29,6 +29,7 @@ goog.provide('Blockly.WorkspaceCommentSvg'); goog.require('Blockly.Events.CommentCreate'); goog.require('Blockly.Events.CommentDelete'); goog.require('Blockly.Events.CommentMove'); +goog.require('Blockly.utils'); goog.require('Blockly.WorkspaceComment'); diff --git a/core/zoom_controls.js b/core/zoom_controls.js index 48eddb2ba..e8af00d40 100644 --- a/core/zoom_controls.js +++ b/core/zoom_controls.js @@ -27,6 +27,8 @@ goog.provide('Blockly.ZoomControls'); goog.require('Blockly.Touch'); +goog.require('Blockly.utils'); + goog.require('goog.dom');