From 9daf2f3be1af401a4760ff2445b625e632031216 Mon Sep 17 00:00:00 2001 From: kozbial Date: Thu, 12 Aug 2021 16:59:59 -0700 Subject: [PATCH] Migrate core/renderers/thrasos/renderer.js to goog.module --- core/renderers/thrasos/renderer.js | 15 +++++++++------ tests/deps.js | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/core/renderers/thrasos/renderer.js b/core/renderers/thrasos/renderer.js index 9bb9bdd97..21e982b92 100644 --- a/core/renderers/thrasos/renderer.js +++ b/core/renderers/thrasos/renderer.js @@ -10,7 +10,8 @@ */ 'use strict'; -goog.provide('Blockly.thrasos.Renderer'); +goog.module('Blockly.thrasos.Renderer'); +goog.module.declareLegacyNamespace(); goog.require('Blockly.blockRendering'); goog.require('Blockly.blockRendering.Renderer'); @@ -27,10 +28,10 @@ goog.requireType('Blockly.BlockSvg'); * @constructor * @extends {Blockly.blockRendering.Renderer} */ -Blockly.thrasos.Renderer = function(name) { - Blockly.thrasos.Renderer.superClass_.constructor.call(this, name); +const Renderer = function(name) { + Renderer.superClass_.constructor.call(this, name); }; -Blockly.utils.object.inherits(Blockly.thrasos.Renderer, +Blockly.utils.object.inherits(Renderer, Blockly.blockRendering.Renderer); /** @@ -40,9 +41,11 @@ Blockly.utils.object.inherits(Blockly.thrasos.Renderer, * @protected * @override */ -Blockly.thrasos.Renderer.prototype.makeRenderInfo_ = function(block) { +Renderer.prototype.makeRenderInfo_ = function(block) { return new Blockly.thrasos.RenderInfo(this, block); }; -Blockly.blockRendering.register('thrasos', Blockly.thrasos.Renderer); +Blockly.blockRendering.register('thrasos', Renderer); + +exports = Renderer; diff --git a/tests/deps.js b/tests/deps.js index 3fbb04372..737b671b0 100644 --- a/tests/deps.js +++ b/tests/deps.js @@ -162,7 +162,7 @@ goog.addDependency('../../core/renderers/minimalist/drawer.js', ['Blockly.minima goog.addDependency('../../core/renderers/minimalist/info.js', ['Blockly.minimalist.RenderInfo'], ['Blockly.blockRendering.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/minimalist/renderer.js', ['Blockly.minimalist.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.minimalist.ConstantProvider', 'Blockly.minimalist.Drawer', 'Blockly.minimalist.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/thrasos/info.js', ['Blockly.thrasos', 'Blockly.thrasos.RenderInfo'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.utils.object']); -goog.addDependency('../../core/renderers/thrasos/renderer.js', ['Blockly.thrasos.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.thrasos.RenderInfo', 'Blockly.utils.object']); +goog.addDependency('../../core/renderers/thrasos/renderer.js', ['Blockly.thrasos.Renderer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.thrasos.RenderInfo', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/zelos/constants.js', ['Blockly.zelos.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'}); 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'});