From d37df416e1f07cbf69187311735bbc82623cb46b Mon Sep 17 00:00:00 2001 From: kozbial Date: Tue, 17 Aug 2021 11:50:32 -0700 Subject: [PATCH] Migrate core/renderers/zelos/measurables/row_elements.js to goog.module --- core/renderers/zelos/measurables/row_elements.js | 11 +++++++---- tests/deps.js | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/core/renderers/zelos/measurables/row_elements.js b/core/renderers/zelos/measurables/row_elements.js index ee3bf1a2a..038e36745 100644 --- a/core/renderers/zelos/measurables/row_elements.js +++ b/core/renderers/zelos/measurables/row_elements.js @@ -10,7 +10,8 @@ * @author samelh@google.com (Sam El-Husseini) */ -goog.provide('Blockly.zelos.RightConnectionShape'); +goog.module('Blockly.zelos.RightConnectionShape'); +goog.module.declareLegacyNamespace(); goog.require('Blockly.blockRendering.Measurable'); goog.require('Blockly.blockRendering.Types'); @@ -28,12 +29,14 @@ goog.requireType('Blockly.blockRendering.ConstantProvider'); * @constructor * @extends {Blockly.blockRendering.Measurable} */ -Blockly.zelos.RightConnectionShape = function(constants) { - Blockly.zelos.RightConnectionShape.superClass_.constructor.call(this, constants); +const RightConnectionShape = function(constants) { + RightConnectionShape.superClass_.constructor.call(this, constants); this.type |= Blockly.blockRendering.Types.getType('RIGHT_CONNECTION'); // Size is dynamic this.height = 0; this.width = 0; }; -Blockly.utils.object.inherits(Blockly.zelos.RightConnectionShape, +Blockly.utils.object.inherits(RightConnectionShape, Blockly.blockRendering.Measurable); + +exports = RightConnectionShape; diff --git a/tests/deps.js b/tests/deps.js index 7a2466581..d59ccc233 100644 --- a/tests/deps.js +++ b/tests/deps.js @@ -182,7 +182,7 @@ goog.addDependency('../../core/renderers/zelos/drawer.js', ['Blockly.zelos.Drawe goog.addDependency('../../core/renderers/zelos/info.js', ['Blockly.zelos.RenderInfo'], ['Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes', 'Blockly.utils.object', 'Blockly.zelos.BottomRow', 'Blockly.zelos.RightConnectionShape', 'Blockly.zelos.TopRow'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/zelos/marker_svg.js', ['Blockly.zelos.MarkerSvg'], ['Blockly.blockRendering.MarkerSvg', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/zelos/measurables/inputs.js', ['Blockly.zelos.StatementInput'], ['Blockly.blockRendering.StatementInput', 'Blockly.utils.object']); -goog.addDependency('../../core/renderers/zelos/measurables/row_elements.js', ['Blockly.zelos.RightConnectionShape'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']); +goog.addDependency('../../core/renderers/zelos/measurables/row_elements.js', ['Blockly.zelos.RightConnectionShape'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/zelos/measurables/rows.js', ['Blockly.zelos.BottomRow', 'Blockly.zelos.TopRow'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.TopRow', 'Blockly.utils.object']); goog.addDependency('../../core/renderers/zelos/path_object.js', ['Blockly.zelos.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.connectionTypes', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo'], {'lang': 'es6', 'module': 'goog'});