From bce1136500c5e2db32638bd1290a70a66ff0eff3 Mon Sep 17 00:00:00 2001
From: kozbial <kozbial@google.com>
Date: Wed, 28 Jul 2021 16:04:21 -0700
Subject: [PATCH] Migrate core/toolbox/separator.js to goog.module

---
 core/toolbox/separator.js | 29 +++++++++++++++++------------
 tests/deps.js             |  2 +-
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/core/toolbox/separator.js b/core/toolbox/separator.js
index 27f475ba4..90a6ab276 100644
--- a/core/toolbox/separator.js
+++ b/core/toolbox/separator.js
@@ -11,12 +11,15 @@
  */
 'use strict';
 
-goog.provide('Blockly.ToolboxSeparator');
+goog.module('Blockly.ToolboxSeparator');
+goog.module.declareLegacyNamespace();
 
+goog.require('Blockly.Css');
 goog.require('Blockly.IToolboxItem');
 goog.require('Blockly.registry');
 goog.require('Blockly.ToolboxItem');
 goog.require('Blockly.utils.dom');
+goog.require('Blockly.utils.object');
 
 goog.requireType('Blockly.IToolbox');
 goog.requireType('Blockly.utils.toolbox');
@@ -32,13 +35,13 @@ goog.requireType('Blockly.utils.toolbox');
  * @extends {Blockly.ToolboxItem}
  * @implements {Blockly.IToolboxItem}
  */
-Blockly.ToolboxSeparator = function(separatorDef, toolbox) {
+const ToolboxSeparator = function(separatorDef, toolbox) {
 
-  Blockly.ToolboxSeparator.superClass_.constructor.call(
+  ToolboxSeparator.superClass_.constructor.call(
       this, separatorDef, toolbox);
   /**
    * All the CSS class names that are used to create a separator.
-   * @type {!Blockly.ToolboxSeparator.CssConfig}
+   * @type {!ToolboxSeparator.CssConfig}
    * @protected
    */
   this.cssConfig_ = {
@@ -48,7 +51,7 @@ Blockly.ToolboxSeparator = function(separatorDef, toolbox) {
   const cssConfig = separatorDef['cssconfig'] || separatorDef['cssConfig'];
   Blockly.utils.object.mixin(this.cssConfig_, cssConfig);
 };
-Blockly.utils.object.inherits(Blockly.ToolboxSeparator, Blockly.ToolboxItem);
+Blockly.utils.object.inherits(ToolboxSeparator, Blockly.ToolboxItem);
 
 /**
  * All the CSS class names that are used to create a separator.
@@ -56,18 +59,18 @@ Blockly.utils.object.inherits(Blockly.ToolboxSeparator, Blockly.ToolboxItem);
  *            container:(string|undefined)
  *          }}
  */
-Blockly.ToolboxSeparator.CssConfig;
+ToolboxSeparator.CssConfig;
 
 /**
  * Name used for registering a toolbox separator.
  * @const {string}
  */
-Blockly.ToolboxSeparator.registrationName = 'sep';
+ToolboxSeparator.registrationName = 'sep';
 
 /**
  * @override
  */
-Blockly.ToolboxSeparator.prototype.init = function() {
+ToolboxSeparator.prototype.init = function() {
   this.createDom_();
 };
 
@@ -76,7 +79,7 @@ Blockly.ToolboxSeparator.prototype.init = function() {
  * @return {!Element} The parent element for the separator.
  * @protected
  */
-Blockly.ToolboxSeparator.prototype.createDom_ = function() {
+ToolboxSeparator.prototype.createDom_ = function() {
   const container = document.createElement('div');
   Blockly.utils.dom.addClass(container, this.cssConfig_['container']);
   this.htmlDiv_ = container;
@@ -86,14 +89,14 @@ Blockly.ToolboxSeparator.prototype.createDom_ = function() {
 /**
  * @override
  */
-Blockly.ToolboxSeparator.prototype.getDiv = function() {
+ToolboxSeparator.prototype.getDiv = function() {
   return this.htmlDiv_;
 };
 
 /**
  * @override
  */
-Blockly.ToolboxSeparator.prototype.dispose = function() {
+ToolboxSeparator.prototype.dispose = function() {
   Blockly.utils.dom.removeNode(this.htmlDiv_);
 };
 
@@ -120,4 +123,6 @@ Blockly.Css.register([
 ]);
 
 Blockly.registry.register(Blockly.registry.Type.TOOLBOX_ITEM,
-    Blockly.ToolboxSeparator.registrationName, Blockly.ToolboxSeparator);
+    ToolboxSeparator.registrationName, ToolboxSeparator);
+
+exports = ToolboxSeparator;
diff --git a/tests/deps.js b/tests/deps.js
index b35d0324a..1e3476539 100644
--- a/tests/deps.js
+++ b/tests/deps.js
@@ -170,7 +170,7 @@ goog.addDependency('../../core/theme/zelos.js', ['Blockly.Themes.Zelos'], ['Bloc
 goog.addDependency('../../core/theme_manager.js', ['Blockly.ThemeManager'], ['Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/category.js', ['Blockly.ToolboxCategory'], ['Blockly.ISelectableToolboxItem', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/toolbox/collapsible_category.js', ['Blockly.CollapsibleToolboxCategory'], ['Blockly.ICollapsibleToolboxItem', 'Blockly.ToolboxCategory', 'Blockly.ToolboxSeparator', 'Blockly.registry', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.toolbox'], {'lang': 'es6', 'module': 'goog'});
-goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.IToolboxItem', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom'], {'lang': 'es5'});
+goog.addDependency('../../core/toolbox/separator.js', ['Blockly.ToolboxSeparator'], ['Blockly.Css', 'Blockly.IToolboxItem', 'Blockly.ToolboxItem', 'Blockly.registry', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/toolbox/toolbox.js', ['Blockly.Toolbox'], ['Blockly.BlockSvg', 'Blockly.CollapsibleToolboxCategory', 'Blockly.ComponentManager', 'Blockly.Css', 'Blockly.DeleteArea', 'Blockly.Events', 'Blockly.Events.ToolboxItemSelect', 'Blockly.IAutoHideable', 'Blockly.IKeyboardAccessible', 'Blockly.IStyleable', 'Blockly.IToolbox', 'Blockly.Options', 'Blockly.Touch', 'Blockly.browserEvents', 'Blockly.constants', 'Blockly.registry', 'Blockly.utils', 'Blockly.utils.Rect', 'Blockly.utils.aria', 'Blockly.utils.dom', 'Blockly.utils.toolbox'], {'lang': 'es5'});
 goog.addDependency('../../core/toolbox/toolbox_item.js', ['Blockly.ToolboxItem'], ['Blockly.IToolboxItem', 'Blockly.utils.IdGenerator'], {'lang': 'es6', 'module': 'goog'});
 goog.addDependency('../../core/tooltip.js', ['Blockly.Tooltip'], ['Blockly.browserEvents', 'Blockly.utils.string']);