Fix some dependencies

core/block.js

@@ -29,6 +29,7 @@ goog.provide('Blockly.Block');
 goog.require('Blockly.Blocks');
 goog.require('Blockly.Comment');
 goog.require('Blockly.Connection');
+goog.require('Blockly.Events');
 goog.require('Blockly.Events.BlockChange');
 goog.require('Blockly.Events.BlockCreate');
 goog.require('Blockly.Events.BlockDelete');

core/block_dragger.js

@@ -28,6 +28,7 @@ goog.provide('Blockly.BlockDragger');
 
 goog.require('Blockly.BlockAnimations');
 goog.require('Blockly.InsertionMarkerManager');
+goog.require('Blockly.Events');
 goog.require('Blockly.Events.BlockMove');
 
 goog.require('goog.math.Coordinate');

core/block_svg.js

@@ -29,9 +29,11 @@ goog.provide('Blockly.BlockSvg');
 goog.require('Blockly.Block');
 goog.require('Blockly.BlockAnimations');
 goog.require('Blockly.ContextMenu');
+goog.require('Blockly.Events');
 goog.require('Blockly.Events.Ui');
 goog.require('Blockly.Events.BlockMove');
 goog.require('Blockly.Grid');
+goog.require('Blockly.Msg');
 goog.require('Blockly.RenderedConnection');
 goog.require('Blockly.Tooltip');
 goog.require('Blockly.Touch');

core/blockly.js

@@ -32,6 +32,7 @@ goog.provide('Blockly');
 
 goog.require('Blockly.BlockSvg.render');
 goog.require('Blockly.Events');
+goog.require('Blockly.Events.Ui');
 goog.require('Blockly.FieldAngle');
 goog.require('Blockly.FieldCheckbox');
 goog.require('Blockly.FieldColour');
@@ -45,9 +46,9 @@ goog.require('Blockly.FieldTextInput');
 goog.require('Blockly.FieldNumber');
 goog.require('Blockly.FieldVariable');
 goog.require('Blockly.Generator');
-goog.require('Blockly.Msg');
 goog.require('Blockly.Procedures');
 goog.require('Blockly.Toolbox');
+goog.require('Blockly.Tooltip');
 goog.require('Blockly.Touch');
 goog.require('Blockly.WidgetDiv');
 goog.require('Blockly.WorkspaceSvg');

core/bubble_dragger.js

@@ -27,6 +27,7 @@
 goog.provide('Blockly.BubbleDragger');
 
 goog.require('Blockly.Bubble');
+goog.require('Blockly.Events');
 goog.require('Blockly.Events.CommentMove');
 goog.require('Blockly.utils');
 goog.require('Blockly.WorkspaceCommentSvg');

core/comment.js

@@ -27,6 +27,7 @@
 goog.provide('Blockly.Comment');
 
 goog.require('Blockly.Bubble');
+goog.require('Blockly.Events');
 goog.require('Blockly.Events.BlockChange');
 goog.require('Blockly.Events.Ui');
 goog.require('Blockly.Icon');

core/connection.js

@@ -26,6 +26,7 @@
 
 goog.provide('Blockly.Connection');
 
+goog.require('Blockly.Events');
 goog.require('Blockly.Events.BlockMove');
 goog.require('Blockly.Xml');
 

core/contextmenu.js

@@ -30,7 +30,9 @@
  */
 goog.provide('Blockly.ContextMenu');
 
+goog.require('Blockly.Events');
 goog.require('Blockly.Events.BlockCreate');
+goog.require('Blockly.Msg');
 goog.require('Blockly.userAgent');
 goog.require('Blockly.utils');
 goog.require('Blockly.utils.uiMenu');

core/events_abstract.js

@@ -29,6 +29,7 @@ goog.provide('Blockly.Events.Abstract');
 
 goog.require('Blockly.Events');
 
+
 /**
  * Abstract class for an event.
  * @constructor

core/extensions.js

@@ -36,6 +36,7 @@ goog.provide('Blockly.Extensions');
 goog.require('Blockly.Mutator');
 goog.require('Blockly.utils');
 
+
 /**
  * The set of all registered extensions, keyed by extension name/id.
  * @private

core/field.js

@@ -28,6 +28,7 @@
 
 goog.provide('Blockly.Field');
 
+goog.require('Blockly.Events');
 goog.require('Blockly.Events.BlockChange');
 goog.require('Blockly.Gesture');
 goog.require('Blockly.userAgent');

core/field_checkbox.js

@@ -26,6 +26,8 @@
 
 goog.provide('Blockly.FieldCheckbox');
 
+goog.require('Blockly.Events');
+goog.require('Blockly.Events.BlockChange');
 goog.require('Blockly.Field');
 goog.require('Blockly.utils');
 

core/field_colour.js

@@ -27,6 +27,8 @@
 goog.provide('Blockly.FieldColour');
 
 goog.require('Blockly.DropDownDiv');
+goog.require('Blockly.Events');
+goog.require('Blockly.Events.BlockChange');
 goog.require('Blockly.Field');
 
 goog.require('goog.math.Size');

core/field_date.js

@@ -26,6 +26,7 @@
 
 goog.provide('Blockly.FieldDate');
 
+goog.require('Blockly.Events');
 goog.require('Blockly.Field');
 goog.require('Blockly.utils');
 

core/field_dropdown.js

@@ -28,6 +28,8 @@
 
 goog.provide('Blockly.FieldDropdown');
 
+goog.require('Blockly.Events');
+goog.require('Blockly.Events.BlockChange');
 goog.require('Blockly.Field');
 goog.require('Blockly.userAgent');
 goog.require('Blockly.utils');

core/field_image.js

@@ -27,6 +27,7 @@
 goog.provide('Blockly.FieldImage');
 
 goog.require('Blockly.Field');
+goog.require('Blockly.Tooltip');
 goog.require('Blockly.utils');
 
 goog.require('goog.math.Size');

core/field_textinput.js

@@ -27,6 +27,8 @@
 goog.provide('Blockly.FieldTextInput');
 
 goog.require('Blockly.DropDownDiv');
+goog.require('Blockly.Events');
+goog.require('Blockly.Events.BlockChange');
 goog.require('Blockly.Field');
 goog.require('Blockly.Msg');
 goog.require('Blockly.userAgent');

core/field_variable.js

@@ -26,11 +26,14 @@
 
 goog.provide('Blockly.FieldVariable');
 
+goog.require('Blockly.Events');
+goog.require('Blockly.Events.BlockChange');
 goog.require('Blockly.FieldDropdown');
 goog.require('Blockly.Msg');
 goog.require('Blockly.utils');
 goog.require('Blockly.VariableModel');
 goog.require('Blockly.Variables');
+goog.require('Blockly.Xml');
 
 goog.require('goog.math.Size');
 

core/flyout_base.js

@@ -32,6 +32,7 @@ goog.require('Blockly.Events.BlockCreate');
 goog.require('Blockly.Events.VarCreate');
 goog.require('Blockly.FlyoutButton');
 goog.require('Blockly.Gesture');
+goog.require('Blockly.Tooltip');
 goog.require('Blockly.Touch');
 goog.require('Blockly.utils');
 goog.require('Blockly.WorkspaceSvg');

core/flyout_horizontal.js

@@ -27,11 +27,9 @@
 goog.provide('Blockly.HorizontalFlyout');
 
 goog.require('Blockly.Block');
-goog.require('Blockly.Events');
-goog.require('Blockly.FlyoutButton');
 goog.require('Blockly.Flyout');
+goog.require('Blockly.FlyoutButton');
 goog.require('Blockly.utils');
-goog.require('Blockly.WorkspaceSvg');
 
 goog.require('goog.math.Rect');
 

core/flyout_vertical.js

@@ -27,12 +27,10 @@
 goog.provide('Blockly.VerticalFlyout');
 
 goog.require('Blockly.Block');
-goog.require('Blockly.Events');
 goog.require('Blockly.Flyout');
 goog.require('Blockly.FlyoutButton');
 goog.require('Blockly.userAgent');
 goog.require('Blockly.utils');
-goog.require('Blockly.WorkspaceSvg');
 
 goog.require('goog.math.Rect');
 

core/gesture.js

@@ -31,6 +31,7 @@ goog.require('Blockly.BlockAnimations');
 goog.require('Blockly.BlockDragger');
 goog.require('Blockly.BubbleDragger');
 goog.require('Blockly.constants');
+goog.require('Blockly.Events');
 goog.require('Blockly.Events.Ui');
 goog.require('Blockly.FlyoutDragger');
 goog.require('Blockly.Tooltip');

core/inject.js

@@ -29,8 +29,10 @@ goog.provide('Blockly.inject');
 goog.require('Blockly.BlockDragSurfaceSvg');
 goog.require('Blockly.Css');
 goog.require('Blockly.DropDownDiv');
+goog.require('Blockly.Events');
 goog.require('Blockly.Grid');
 goog.require('Blockly.Options');
+goog.require('Blockly.Tooltip');
 goog.require('Blockly.userAgent');
 goog.require('Blockly.utils');
 goog.require('Blockly.WorkspaceSvg');

core/insertion_marker_manager.js

@@ -27,7 +27,7 @@
 goog.provide('Blockly.InsertionMarkerManager');
 
 goog.require('Blockly.BlockAnimations');
-goog.require('Blockly.Events.BlockMove');
+goog.require('Blockly.Events');
 goog.require('Blockly.RenderedConnection');
 
 

core/mutator.js

@@ -28,6 +28,7 @@
 goog.provide('Blockly.Mutator');
 
 goog.require('Blockly.Bubble');
+goog.require('Blockly.Events');
 goog.require('Blockly.Events.BlockChange');
 goog.require('Blockly.Events.Ui');
 goog.require('Blockly.Icon');

core/procedures.js

@@ -32,8 +32,10 @@ goog.provide('Blockly.Procedures');
 
 goog.require('Blockly.Blocks');
 goog.require('Blockly.constants');
+goog.require('Blockly.Events');
 goog.require('Blockly.Events.BlockChange');
 goog.require('Blockly.Field');
+goog.require('Blockly.Msg');
 goog.require('Blockly.Names');
 goog.require('Blockly.Workspace');
 goog.require('Blockly.Xml');

core/rendered_connection.js

@@ -27,6 +27,7 @@
 goog.provide('Blockly.RenderedConnection');
 
 goog.require('Blockly.Connection');
+goog.require('Blockly.Events');
 goog.require('Blockly.utils');
 
 goog.require('goog.math.Coordinate');

core/theme.js

@@ -24,6 +24,8 @@
 'use strict';
 
 goog.provide('Blockly.Theme');
+
+
 /**
  * Class for a theme.
  * @param {Object.<string, Blockly.BlockStyle>} blockStyles A map from style

core/theme/classic.js

@@ -29,6 +29,7 @@ goog.provide('Blockly.Themes.Classic');
 
 goog.require('Blockly.Theme');
 
+
 var defaultBlockStyles = {
   "colour_blocks":{
     "colourPrimary": "20"

core/theme/highcontrast.js

@@ -28,6 +28,7 @@ goog.provide('Blockly.Themes.HighContrast');
 
 goog.require('Blockly.Theme');
 
+
 var defaultBlockStyles = {
   "colour_blocks":{
     "colourPrimary": "#a52714",

core/theme/modern.js

@@ -28,6 +28,7 @@ goog.provide('Blockly.Themes.Modern');
 
 goog.require('Blockly.Theme');
 
+
 var defaultBlockStyles = {
   "colour_blocks": {
     "colourPrimary": "#a5745b",

core/toolbox.js

@@ -26,6 +26,7 @@
 
 goog.provide('Blockly.Toolbox');
 
+goog.require('Blockly.Events');
 goog.require('Blockly.Events.Ui');
 goog.require('Blockly.Flyout');
 goog.require('Blockly.HorizontalFlyout');

core/trashcan.js

@@ -27,6 +27,7 @@
 goog.provide('Blockly.Trashcan');
 
 goog.require('Blockly.utils');
+goog.require('Blockly.Xml');
 
 goog.require('goog.math.Rect');
 

core/utils.js

@@ -32,6 +32,7 @@
  */
 goog.provide('Blockly.utils');
 
+goog.require('Blockly.Msg');
 goog.require('Blockly.userAgent');
 
 goog.require('goog.math.Coordinate');
@@ -1021,4 +1022,3 @@ Blockly.utils.clampNumber = function(lowerBound, number, upperBound) {
  * Reference to the global object.
  */
 Blockly.utils.global = this || self;
-

core/variable_map.js

@@ -26,8 +26,10 @@
 
 goog.provide('Blockly.VariableMap');
 
+goog.require('Blockly.Events');
 goog.require('Blockly.Events.VarDelete');
 goog.require('Blockly.Events.VarRename');
+goog.require('Blockly.Msg');
 goog.require('Blockly.utils');
 
 

core/variable_model.js

@@ -26,6 +26,7 @@
 
 goog.provide('Blockly.VariableModel');
 
+goog.require('Blockly.Events');
 goog.require('Blockly.Events.VarCreate');
 goog.require('Blockly.utils');
 

core/variables.js

@@ -31,9 +31,8 @@
 goog.provide('Blockly.Variables');
 
 goog.require('Blockly.Blocks');
-goog.require('Blockly.constants');
+goog.require('Blockly.Msg');
 goog.require('Blockly.VariableModel');
-goog.require('Blockly.Workspace');
 goog.require('Blockly.Xml');
 
 goog.require('goog.string');

core/variables_dynamic.js

@@ -29,10 +29,8 @@ goog.provide('Blockly.VariablesDynamic');
 
 goog.require('Blockly.Variables');
 goog.require('Blockly.Blocks');
-goog.require('Blockly.constants');
+goog.require('Blockly.Msg');
 goog.require('Blockly.VariableModel');
-// TODO Fix circular dependencies
-// goog.require('Blockly.Workspace');
 goog.require('Blockly.Xml');
 
 

core/warning.js

@@ -27,6 +27,7 @@
 goog.provide('Blockly.Warning');
 
 goog.require('Blockly.Bubble');
+goog.require('Blockly.Events');
 goog.require('Blockly.Events.Ui');
 goog.require('Blockly.Icon');
 goog.require('Blockly.utils');

core/widgetdiv.js

@@ -33,6 +33,7 @@
 goog.provide('Blockly.WidgetDiv');
 
 goog.require('Blockly.Css');
+
 goog.require('goog.style');
 
 

core/workspace.js

@@ -26,6 +26,7 @@
 
 goog.provide('Blockly.Workspace');
 
+goog.require('Blockly.Events');
 goog.require('Blockly.utils');
 goog.require('Blockly.VariableMap');
 goog.require('Blockly.WorkspaceComment');

core/workspace_comment.js

@@ -26,6 +26,7 @@
 
 goog.provide('Blockly.WorkspaceComment');
 
+goog.require('Blockly.Events');
 goog.require('Blockly.Events.CommentChange');
 goog.require('Blockly.Events.CommentCreate');
 goog.require('Blockly.Events.CommentDelete');

core/workspace_comment_svg.js

@@ -26,9 +26,11 @@
 
 goog.provide('Blockly.WorkspaceCommentSvg');
 
+goog.require('Blockly.Events');
 goog.require('Blockly.Events.CommentCreate');
 goog.require('Blockly.Events.CommentDelete');
 goog.require('Blockly.Events.CommentMove');
+goog.require('Blockly.Events.Ui');
 goog.require('Blockly.utils');
 goog.require('Blockly.WorkspaceComment');
 

core/workspace_events.js

@@ -29,6 +29,7 @@ goog.provide('Blockly.Events.FinishedLoading');
 goog.require('Blockly.Events');
 goog.require('Blockly.Events.Abstract');
 
+
 /**
  * Class for a finished loading event.
  * Used to notify the developer when the workspace has finished loading (i.e

core/workspace_svg.js

@@ -30,9 +30,11 @@ goog.provide('Blockly.WorkspaceSvg');
 //goog.require('Blockly.BlockSvg');
 goog.require('Blockly.ConnectionDB');
 goog.require('Blockly.constants');
+goog.require('Blockly.Events');
 goog.require('Blockly.Events.BlockCreate');
 goog.require('Blockly.Gesture');
 goog.require('Blockly.Grid');
+goog.require('Blockly.Msg');
 goog.require('Blockly.Options');
 goog.require('Blockly.ScrollbarPair');
 goog.require('Blockly.Touch');

core/xml.js

@@ -30,6 +30,7 @@
  */
 goog.provide('Blockly.Xml');
 
+goog.require('Blockly.Events');
 goog.require('Blockly.Events.BlockCreate');
 goog.require('Blockly.Events.FinishedLoading');
 goog.require('Blockly.Events.VarCreate');