chore: Remove declareLegacyNamespace() from field_* files

google · Sep 23, 2021 · da893a1 · da893a1
1 parent 1504c99
commit da893a1
Show file tree

Hide file tree

Showing 16 changed files with 31 additions and 18 deletions.
diff --git a/core/blockly.js b/core/blockly.js
@@ -18,6 +18,17 @@ goog.module('Blockly');
 goog.module.declareLegacyNamespace();
 
 const Blocks = goog.require('Blockly.Blocks');
+const Field = goog.require('Blockly.Field');
+const FieldCheckbox = goog.require('Blockly.FieldCheckbox');
+const FieldColour = goog.require('Blockly.FieldColour');
+const FieldDropdown = goog.require('Blockly.FieldDropdown');
+const FieldImage = goog.require('Blockly.FieldImage');
+const FieldLabel = goog.require('Blockly.FieldLabel');
+const FieldLabelSerializable = goog.require('Blockly.FieldLabelSerializable');
+const FieldMultilineInput = goog.require('Blockly.FieldMultilineInput');
+const FieldNumber = goog.require('Blockly.FieldNumber');
+const FieldTextInput = goog.require('Blockly.FieldTextInput');
+const FieldVariable = goog.require('Blockly.FieldVariable');
 /* eslint-disable-next-line no-unused-vars */
 const ICopyable = goog.requireType('Blockly.ICopyable');
 const Marker = goog.require('Blockly.Marker');
@@ -35,6 +46,7 @@ const connectionTypes = goog.require('Blockly.connectionTypes');
 const constants = goog.require('Blockly.constants');
 const deprecation = goog.require('Blockly.utils.deprecation');
 const dialog = goog.require('Blockly.dialog');
+const fieldRegistry = goog.require('Blockly.fieldRegistry');
 const inputTypes = goog.require('Blockly.inputTypes');
 const internalConstants = goog.require('Blockly.internalConstants');
 const toolbox = goog.require('Blockly.utils.toolbox');
@@ -426,5 +438,17 @@ exports.BlockDragger = BlockDragger;
 exports.BlockDragSurfaceSvg = BlockDragSurfaceSvg;
 exports.BlockSvg = BlockSvg;
 exports.Cursor = Cursor;
+exports.Field = Field;
+exports.FieldCheckbox = FieldCheckbox;
+exports.FieldColour = FieldColour;
+exports.FieldDropdown = FieldDropdown;
+exports.FieldImage = FieldImage;
+exports.FieldLabel = FieldLabel;
+exports.FieldLabelSerializable = FieldLabelSerializable;
+exports.FieldMultilineInput = FieldMultilineInput;
+exports.FieldNumber = FieldNumber;
+exports.FieldTextInput = FieldTextInput;
+exports.FieldVariable = FieldVariable;
 exports.Marker = Marker;
 exports.TabNavigateCursor = TabNavigateCursor;
+exports.fieldRegistry = fieldRegistry;
diff --git a/core/events/events_block_change.js b/core/events/events_block_change.js
@@ -13,6 +13,7 @@
 goog.module('Blockly.Events.BlockChange');
 goog.module.declareLegacyNamespace();
 
+const BlockBase = goog.require('Blockly.Events.BlockBase');
 const Events = goog.require('Blockly.Events');
 const Xml = goog.require('Blockly.Xml');
 const object = goog.require('Blockly.utils.object');
@@ -31,7 +32,7 @@ const {BlockSvg} = goog.requireType('Blockly.BlockSvg');
  * @param {?string=} opt_name Name of input or field affected, or null.
  * @param {*=} opt_oldValue Previous value of element.
  * @param {*=} opt_newValue New value of element.
- * @extends {Events.BlockBase}
+ * @extends {BlockBase}
  * @constructor
  */
 const BlockChange = function(
@@ -45,7 +46,7 @@ const BlockChange = function(
   this.oldValue = typeof opt_oldValue == 'undefined' ? '' : opt_oldValue;
   this.newValue = typeof opt_newValue == 'undefined' ? '' : opt_newValue;
 };
-object.inherits(BlockChange, Events.BlockBase);
+object.inherits(BlockChange, BlockBase);
 
 /**
  * Type of this event.

diff --git a/core/field.js b/core/field.js
@@ -13,7 +13,6 @@
 'use strict';
 
 goog.module('Blockly.Field');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvider');

diff --git a/core/field_checkbox.js b/core/field_checkbox.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.FieldCheckbox');
-goog.module.declareLegacyNamespace();
 
 const Field = goog.require('Blockly.Field');
 const dom = goog.require('Blockly.utils.dom');

diff --git a/core/field_colour.js b/core/field_colour.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.FieldColour');
-goog.module.declareLegacyNamespace();
 
 const Css = goog.require('Blockly.Css');
 const DropDownDiv = goog.require('Blockly.DropDownDiv');

diff --git a/core/field_dropdown.js b/core/field_dropdown.js
@@ -13,7 +13,6 @@
 'use strict';
 
 goog.module('Blockly.FieldDropdown');
-goog.module.declareLegacyNamespace();
 
 const Coordinate = goog.require('Blockly.utils.Coordinate');
 const DropDownDiv = goog.require('Blockly.DropDownDiv');

diff --git a/core/field_image.js b/core/field_image.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.FieldImage');
-goog.module.declareLegacyNamespace();
 
 const Field = goog.require('Blockly.Field');
 const Size = goog.require('Blockly.utils.Size');

diff --git a/core/field_label.js b/core/field_label.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.FieldLabel');
-goog.module.declareLegacyNamespace();
 
 const Field = goog.require('Blockly.Field');
 const dom = goog.require('Blockly.utils.dom');

diff --git a/core/field_label_serializable.js b/core/field_label_serializable.js
@@ -12,7 +12,6 @@
 'use strict';
 
 goog.module('Blockly.FieldLabelSerializable');
-goog.module.declareLegacyNamespace();
 
 const FieldLabel = goog.require('Blockly.FieldLabel');
 const fieldRegistry = goog.require('Blockly.fieldRegistry');

diff --git a/core/field_multilineinput.js b/core/field_multilineinput.js
@@ -13,7 +13,6 @@
 'use strict';
 
 goog.module('Blockly.FieldMultilineInput');
-goog.module.declareLegacyNamespace();
 
 const Css = goog.require('Blockly.Css');
 const Field = goog.require('Blockly.Field');

diff --git a/core/field_number.js b/core/field_number.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.FieldNumber');
-goog.module.declareLegacyNamespace();
 
 const FieldTextInput = goog.require('Blockly.FieldTextInput');
 const aria = goog.require('Blockly.utils.aria');

diff --git a/core/field_registry.js b/core/field_registry.js
@@ -13,7 +13,6 @@
 'use strict';
 
 goog.module('Blockly.fieldRegistry');
-goog.module.declareLegacyNamespace();
 
 /* eslint-disable-next-line no-unused-vars */
 const Field = goog.requireType('Blockly.Field');

diff --git a/core/field_textinput.js b/core/field_textinput.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.FieldTextInput');
-goog.module.declareLegacyNamespace();
 
 const Coordinate = goog.require('Blockly.utils.Coordinate');
 const DropDownDiv = goog.require('Blockly.DropDownDiv');

diff --git a/core/field_variable.js b/core/field_variable.js
@@ -11,7 +11,6 @@
 'use strict';
 
 goog.module('Blockly.FieldVariable');
-goog.module.declareLegacyNamespace();
 
 const FieldDropdown = goog.require('Blockly.FieldDropdown');
 /* eslint-disable-next-line no-unused-vars */

diff --git a/tests/deps.js b/tests/deps.js
diff --git a/tests/deps.mocha.js b/tests/deps.mocha.js