From a9fdf7844a2db8a800f4b400dc62d71ef56d83c4 Mon Sep 17 00:00:00 2001
From: Neil Fraser <fraser@google.com>
Date: Thu, 6 Jun 2019 21:01:32 -0700
Subject: [PATCH] Fix ordering of requires

Search and replace of a name strikes again.
---
 core/block.js                 | 4 ++--
 core/block_drag_surface.js    | 2 +-
 core/block_dragger.js         | 4 ++--
 core/block_events.js          | 2 +-
 core/bubble.js                | 2 +-
 core/bubble_dragger.js        | 2 +-
 core/contextmenu.js           | 2 +-
 core/field_textinput.js       | 2 +-
 core/flyout_base.js           | 2 +-
 core/flyout_button.js         | 2 +-
 core/gesture.js               | 2 +-
 core/icon.js                  | 2 +-
 core/scrollbar.js             | 2 +-
 core/touch_gesture.js         | 2 +-
 core/workspace_comment.js     | 2 +-
 core/workspace_comment_svg.js | 2 +-
 core/workspace_svg.js         | 4 ++--
 core/ws_comment_events.js     | 2 +-
 18 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/core/block.js b/core/block.js
index cf561bbce..35b5443de 100644
--- a/core/block.js
+++ b/core/block.js
@@ -29,8 +29,6 @@ goog.provide('Blockly.Block');
 goog.require('Blockly.Blocks');
 goog.require('Blockly.Comment');
 goog.require('Blockly.Connection');
-goog.require('Blockly.utils.Coordinate');
-goog.require('Blockly.utils.string');
 goog.require('Blockly.Events');
 goog.require('Blockly.Events.BlockChange');
 goog.require('Blockly.Events.BlockCreate');
@@ -40,6 +38,8 @@ goog.require('Blockly.Extensions');
 goog.require('Blockly.Input');
 goog.require('Blockly.Mutator');
 goog.require('Blockly.utils');
+goog.require('Blockly.utils.Coordinate');
+goog.require('Blockly.utils.string');
 goog.require('Blockly.Warning');
 goog.require('Blockly.Workspace');
 
diff --git a/core/block_drag_surface.js b/core/block_drag_surface.js
index 853b17636..18c7e70f2 100644
--- a/core/block_drag_surface.js
+++ b/core/block_drag_surface.js
@@ -30,8 +30,8 @@
 'use strict';
 
 goog.provide('Blockly.BlockDragSurfaceSvg');
-goog.require('Blockly.utils.Coordinate');
 goog.require('Blockly.utils');
+goog.require('Blockly.utils.Coordinate');
 
 
 /**
diff --git a/core/block_dragger.js b/core/block_dragger.js
index 3b0a60398..a002e77a0 100644
--- a/core/block_dragger.js
+++ b/core/block_dragger.js
@@ -27,10 +27,10 @@
 goog.provide('Blockly.BlockDragger');
 
 goog.require('Blockly.BlockAnimations');
-goog.require('Blockly.utils.Coordinate');
-goog.require('Blockly.InsertionMarkerManager');
 goog.require('Blockly.Events');
 goog.require('Blockly.Events.BlockMove');
+goog.require('Blockly.InsertionMarkerManager');
+goog.require('Blockly.utils.Coordinate');
 
 
 /**
diff --git a/core/block_events.js b/core/block_events.js
index 4d4283d06..b40316871 100644
--- a/core/block_events.js
+++ b/core/block_events.js
@@ -34,9 +34,9 @@ goog.provide('Blockly.Events.Create');  // Deprecated.
 goog.provide('Blockly.Events.Delete');  // Deprecated.
 goog.provide('Blockly.Events.Move');  // Deprecated.
 
-goog.require('Blockly.utils.Coordinate');
 goog.require('Blockly.Events');
 goog.require('Blockly.Events.Abstract');
+goog.require('Blockly.utils.Coordinate');
 goog.require('Blockly.Xml.utils');
 
 
diff --git a/core/bubble.js b/core/bubble.js
index b4e67800a..18f6b07a4 100644
--- a/core/bubble.js
+++ b/core/bubble.js
@@ -26,9 +26,9 @@
 
 goog.provide('Blockly.Bubble');
 
-goog.require('Blockly.utils.Coordinate');
 goog.require('Blockly.Touch');
 goog.require('Blockly.utils');
+goog.require('Blockly.utils.Coordinate');
 goog.require('Blockly.utils.dom');
 goog.require('Blockly.utils.math');
 goog.require('Blockly.utils.userAgent');
diff --git a/core/bubble_dragger.js b/core/bubble_dragger.js
index 42dfc9bd0..3fe0cd569 100644
--- a/core/bubble_dragger.js
+++ b/core/bubble_dragger.js
@@ -27,10 +27,10 @@
 goog.provide('Blockly.BubbleDragger');
 
 goog.require('Blockly.Bubble');
-goog.require('Blockly.utils.Coordinate');
 goog.require('Blockly.Events');
 goog.require('Blockly.Events.CommentMove');
 goog.require('Blockly.utils');
+goog.require('Blockly.utils.Coordinate');
 goog.require('Blockly.WorkspaceCommentSvg');
 
 
diff --git a/core/contextmenu.js b/core/contextmenu.js
index 838fa03a2..489a25b58 100644
--- a/core/contextmenu.js
+++ b/core/contextmenu.js
@@ -30,11 +30,11 @@
  */
 goog.provide('Blockly.ContextMenu');
 
-goog.require('Blockly.utils.Coordinate');
 goog.require('Blockly.Events');
 goog.require('Blockly.Events.BlockCreate');
 goog.require('Blockly.Msg');
 goog.require('Blockly.utils');
+goog.require('Blockly.utils.Coordinate');
 goog.require('Blockly.utils.dom');
 goog.require('Blockly.utils.uiMenu');
 goog.require('Blockly.utils.userAgent');
diff --git a/core/field_textinput.js b/core/field_textinput.js
index cb659788d..027f4f683 100644
--- a/core/field_textinput.js
+++ b/core/field_textinput.js
@@ -26,13 +26,13 @@
 
 goog.provide('Blockly.FieldTextInput');
 
-goog.require('Blockly.utils.Coordinate');
 goog.require('Blockly.DropDownDiv');
 goog.require('Blockly.Events');
 goog.require('Blockly.Events.BlockChange');
 goog.require('Blockly.Field');
 goog.require('Blockly.Msg');
 goog.require('Blockly.utils');
+goog.require('Blockly.utils.Coordinate');
 goog.require('Blockly.utils.dom');
 goog.require('Blockly.utils.userAgent');
 
diff --git a/core/flyout_base.js b/core/flyout_base.js
index 8375600d9..2d37598f3 100644
--- a/core/flyout_base.js
+++ b/core/flyout_base.js
@@ -27,7 +27,6 @@
 goog.provide('Blockly.Flyout');
 
 goog.require('Blockly.Block');
-goog.require('Blockly.utils.Coordinate');
 goog.require('Blockly.Events');
 goog.require('Blockly.Events.BlockCreate');
 goog.require('Blockly.Events.VarCreate');
@@ -36,6 +35,7 @@ goog.require('Blockly.Gesture');
 goog.require('Blockly.Tooltip');
 goog.require('Blockly.Touch');
 goog.require('Blockly.utils');
+goog.require('Blockly.utils.Coordinate');
 goog.require('Blockly.utils.dom');
 goog.require('Blockly.WorkspaceSvg');
 goog.require('Blockly.Xml');
diff --git a/core/flyout_button.js b/core/flyout_button.js
index 34dd9455e..9a8a9776e 100644
--- a/core/flyout_button.js
+++ b/core/flyout_button.js
@@ -26,8 +26,8 @@
 
 goog.provide('Blockly.FlyoutButton');
 
-goog.require('Blockly.utils.Coordinate');
 goog.require('Blockly.utils');
+goog.require('Blockly.utils.Coordinate');
 goog.require('Blockly.utils.dom');
 
 
diff --git a/core/gesture.js b/core/gesture.js
index a0cc3baf0..b2f552752 100644
--- a/core/gesture.js
+++ b/core/gesture.js
@@ -31,13 +31,13 @@ goog.require('Blockly.BlockAnimations');
 goog.require('Blockly.BlockDragger');
 goog.require('Blockly.BubbleDragger');
 goog.require('Blockly.constants');
-goog.require('Blockly.utils.Coordinate');
 goog.require('Blockly.Events');
 goog.require('Blockly.Events.Ui');
 goog.require('Blockly.FlyoutDragger');
 goog.require('Blockly.Tooltip');
 goog.require('Blockly.Touch');
 goog.require('Blockly.utils');
+goog.require('Blockly.utils.Coordinate');
 goog.require('Blockly.WorkspaceDragger');
 
 
diff --git a/core/icon.js b/core/icon.js
index 27af9f032..85d9dc445 100644
--- a/core/icon.js
+++ b/core/icon.js
@@ -26,8 +26,8 @@
 
 goog.provide('Blockly.Icon');
 
-goog.require('Blockly.utils.Coordinate');
 goog.require('Blockly.utils');
+goog.require('Blockly.utils.Coordinate');
 goog.require('Blockly.utils.dom');
 
 
diff --git a/core/scrollbar.js b/core/scrollbar.js
index 9d1cc1c84..11e5ecf2d 100644
--- a/core/scrollbar.js
+++ b/core/scrollbar.js
@@ -27,9 +27,9 @@
 goog.provide('Blockly.Scrollbar');
 goog.provide('Blockly.ScrollbarPair');
 
-goog.require('Blockly.utils.Coordinate');
 goog.require('Blockly.Touch');
 goog.require('Blockly.utils');
+goog.require('Blockly.utils.Coordinate');
 goog.require('Blockly.utils.dom');
 
 
diff --git a/core/touch_gesture.js b/core/touch_gesture.js
index 9dcfbdded..780579cf1 100644
--- a/core/touch_gesture.js
+++ b/core/touch_gesture.js
@@ -27,9 +27,9 @@
 
 goog.provide('Blockly.TouchGesture');
 
-goog.require('Blockly.utils.Coordinate');
 goog.require('Blockly.Gesture');
 goog.require('Blockly.utils');
+goog.require('Blockly.utils.Coordinate');
 
 
 /*
diff --git a/core/workspace_comment.js b/core/workspace_comment.js
index 9b418d7ce..0d40c2d60 100644
--- a/core/workspace_comment.js
+++ b/core/workspace_comment.js
@@ -26,13 +26,13 @@
 
 goog.provide('Blockly.WorkspaceComment');
 
-goog.require('Blockly.utils.Coordinate');
 goog.require('Blockly.Events');
 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('Blockly.utils.Coordinate');
 goog.require('Blockly.Xml.utils');
 
 
diff --git a/core/workspace_comment_svg.js b/core/workspace_comment_svg.js
index e8d8720da..08d2b3c26 100644
--- a/core/workspace_comment_svg.js
+++ b/core/workspace_comment_svg.js
@@ -26,13 +26,13 @@
 
 goog.provide('Blockly.WorkspaceCommentSvg');
 
-goog.require('Blockly.utils.Coordinate');
 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.utils.Coordinate');
 goog.require('Blockly.utils.dom');
 goog.require('Blockly.WorkspaceComment');
 
diff --git a/core/workspace_svg.js b/core/workspace_svg.js
index b86e6a13c..eb7ec7666 100644
--- a/core/workspace_svg.js
+++ b/core/workspace_svg.js
@@ -30,7 +30,6 @@ goog.provide('Blockly.WorkspaceSvg');
 //goog.require('Blockly.BlockSvg');
 goog.require('Blockly.ConnectionDB');
 goog.require('Blockly.constants');
-goog.require('Blockly.utils.Coordinate');
 goog.require('Blockly.Events');
 goog.require('Blockly.Events.BlockCreate');
 goog.require('Blockly.Gesture');
@@ -42,6 +41,7 @@ goog.require('Blockly.Touch');
 goog.require('Blockly.TouchGesture');
 goog.require('Blockly.Trashcan');
 goog.require('Blockly.utils');
+goog.require('Blockly.utils.Coordinate');
 goog.require('Blockly.utils.dom');
 goog.require('Blockly.VariablesDynamic');
 goog.require('Blockly.Workspace');
@@ -1367,7 +1367,7 @@ Blockly.WorkspaceSvg.prototype.getBlocksBoundingBox = function() {
   // Initialize boundary using the first block.
   var boundary = topElements[0].getBoundingRectangle();
 
-  // Start at 1 since the 0th block was used for initialization
+  // Start at 1 since the 0th block was used for initialization.
   for (var i = 1; i < topElements.length; i++) {
     var blockBoundary = topElements[i].getBoundingRectangle();
     if (blockBoundary.left < boundary.left) {
diff --git a/core/ws_comment_events.js b/core/ws_comment_events.js
index ac5e7c8d7..85552332b 100644
--- a/core/ws_comment_events.js
+++ b/core/ws_comment_events.js
@@ -30,9 +30,9 @@ goog.provide('Blockly.Events.CommentCreate');
 goog.provide('Blockly.Events.CommentDelete');
 goog.provide('Blockly.Events.CommentMove');
 
-goog.require('Blockly.utils.Coordinate');
 goog.require('Blockly.Events');
 goog.require('Blockly.Events.Abstract');
+goog.require('Blockly.utils.Coordinate');
 goog.require('Blockly.Xml');
 goog.require('Blockly.Xml.utils');