From c85714b1c695ef923b2a7c67c7b7455272eb454f Mon Sep 17 00:00:00 2001 From: kozbial Date: Tue, 17 Aug 2021 09:29:51 -0700 Subject: [PATCH] Migrate core/renderers/zelos/measurables/rows.js to goog.module --- core/renderers/zelos/measurables/bottom_row.js | 17 ++++++++++------- core/renderers/zelos/measurables/top_row.js | 17 ++++++++++------- tests/deps.js | 4 ++-- 3 files changed, 22 insertions(+), 16 deletions(-) diff --git a/core/renderers/zelos/measurables/bottom_row.js b/core/renderers/zelos/measurables/bottom_row.js index 16aa4c86e..eb854466a 100644 --- a/core/renderers/zelos/measurables/bottom_row.js +++ b/core/renderers/zelos/measurables/bottom_row.js @@ -10,7 +10,8 @@ */ 'use strict'; -goog.provide('Blockly.zelos.BottomRow'); +goog.module('Blockly.zelos.BottomRow'); +goog.module.declareLegacyNamespace(); goog.require('Blockly.blockRendering.BottomRow'); goog.require('Blockly.utils.object'); @@ -29,16 +30,16 @@ goog.requireType('Blockly.blockRendering.ConstantProvider'); * @constructor * @extends {Blockly.blockRendering.BottomRow} */ -Blockly.zelos.BottomRow = function(constants) { - Blockly.zelos.BottomRow.superClass_.constructor.call(this, constants); +const BottomRow = function(constants) { + BottomRow.superClass_.constructor.call(this, constants); }; -Blockly.utils.object.inherits(Blockly.zelos.BottomRow, +Blockly.utils.object.inherits(BottomRow, Blockly.blockRendering.BottomRow); /** * @override */ -Blockly.zelos.BottomRow.prototype.endsWithElemSpacer = function() { +BottomRow.prototype.endsWithElemSpacer = function() { return false; }; @@ -46,7 +47,7 @@ Blockly.zelos.BottomRow.prototype.endsWithElemSpacer = function() { * Render a round corner unless the block has an output connection. * @override */ -Blockly.zelos.BottomRow.prototype.hasLeftSquareCorner = function(block) { +BottomRow.prototype.hasLeftSquareCorner = function(block) { return !!block.outputConnection; }; @@ -54,7 +55,9 @@ Blockly.zelos.BottomRow.prototype.hasLeftSquareCorner = function(block) { * Render a round corner unless the block has an output connection. * @override */ -Blockly.zelos.BottomRow.prototype.hasRightSquareCorner = function(block) { +BottomRow.prototype.hasRightSquareCorner = function(block) { return !!block.outputConnection && !block.statementInputCount && !block.nextConnection; }; + +exports = BottomRow; diff --git a/core/renderers/zelos/measurables/top_row.js b/core/renderers/zelos/measurables/top_row.js index 3f4dbafa8..176b637e1 100644 --- a/core/renderers/zelos/measurables/top_row.js +++ b/core/renderers/zelos/measurables/top_row.js @@ -10,7 +10,8 @@ */ 'use strict'; -goog.provide('Blockly.zelos.TopRow'); +goog.module('Blockly.zelos.TopRow'); +goog.module.declareLegacyNamespace(); goog.require('Blockly.blockRendering.TopRow'); goog.require('Blockly.utils.object'); @@ -31,16 +32,16 @@ goog.requireType('Blockly.blockRendering.ConstantProvider'); * @constructor * @extends {Blockly.blockRendering.TopRow} */ -Blockly.zelos.TopRow = function(constants) { - Blockly.zelos.TopRow.superClass_.constructor.call(this, constants); +const TopRow = function(constants) { + TopRow.superClass_.constructor.call(this, constants); }; -Blockly.utils.object.inherits(Blockly.zelos.TopRow, +Blockly.utils.object.inherits(TopRow, Blockly.blockRendering.TopRow); /** * @override */ -Blockly.zelos.TopRow.prototype.endsWithElemSpacer = function() { +TopRow.prototype.endsWithElemSpacer = function() { return false; }; @@ -48,7 +49,7 @@ Blockly.zelos.TopRow.prototype.endsWithElemSpacer = function() { * Render a round corner unless the block has an output connection. * @override */ -Blockly.zelos.TopRow.prototype.hasLeftSquareCorner = function(block) { +TopRow.prototype.hasLeftSquareCorner = function(block) { const hasHat = (block.hat ? block.hat === 'cap' : this.constants_.ADD_START_HATS) && !block.outputConnection && !block.previousConnection; @@ -59,7 +60,9 @@ Blockly.zelos.TopRow.prototype.hasLeftSquareCorner = function(block) { * Render a round corner unless the block has an output connection. * @override */ -Blockly.zelos.TopRow.prototype.hasRightSquareCorner = function(block) { +TopRow.prototype.hasRightSquareCorner = function(block) { return !!block.outputConnection && !block.statementInputCount && !block.nextConnection; }; + +exports = TopRow; diff --git a/tests/deps.js b/tests/deps.js index 940499b52..fbf988c97 100644 --- a/tests/deps.js +++ b/tests/deps.js @@ -181,10 +181,10 @@ goog.addDependency('../../core/renderers/zelos/constants.js', ['Blockly.zelos.Co goog.addDependency('../../core/renderers/zelos/drawer.js', ['Blockly.zelos.Drawer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Drawer', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'}); 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/bottom_row.js', ['Blockly.zelos.BottomRow'], ['Blockly.blockRendering.BottomRow', 'Blockly.utils.object']); +goog.addDependency('../../core/renderers/zelos/measurables/bottom_row.js', ['Blockly.zelos.BottomRow'], ['Blockly.blockRendering.BottomRow', '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'], {'lang': 'es6', 'module': 'goog'}); -goog.addDependency('../../core/renderers/zelos/measurables/top_row.js', ['Blockly.zelos.TopRow'], ['Blockly.blockRendering.TopRow', 'Blockly.utils.object']); +goog.addDependency('../../core/renderers/zelos/measurables/top_row.js', ['Blockly.zelos.TopRow'], ['Blockly.blockRendering.TopRow', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'}); 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'}); goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);