diff --git a/core/renderers/minimalist/drawer.js b/core/renderers/minimalist/drawer.js index 592710d6d..033f90741 100644 --- a/core/renderers/minimalist/drawer.js +++ b/core/renderers/minimalist/drawer.js @@ -9,12 +9,15 @@ */ 'use strict'; -goog.provide('Blockly.minimalist.Drawer'); +goog.module('Blockly.minimalist.Drawer'); +goog.module.declareLegacyNamespace(); goog.require('Blockly.blockRendering.Drawer'); -goog.require('Blockly.minimalist.RenderInfo'); goog.require('Blockly.utils.object'); +goog.requireType('Blockly.BlockSvg'); +goog.requireType('Blockly.minimalist.RenderInfo'); + /** * An object that draws a block based on the given rendering information. @@ -25,8 +28,10 @@ goog.require('Blockly.utils.object'); * @constructor * @extends {Blockly.blockRendering.Drawer} */ -Blockly.minimalist.Drawer = function(block, info) { - Blockly.minimalist.Drawer.superClass_.constructor.call(this, block, info); +const Drawer = function(block, info) { + Drawer.superClass_.constructor.call(this, block, info); }; -Blockly.utils.object.inherits(Blockly.minimalist.Drawer, +Blockly.utils.object.inherits(Drawer, Blockly.blockRendering.Drawer); + +exports = Drawer; diff --git a/tests/deps.js b/tests/deps.js index 874dcb83d..8c0415c0e 100644 --- a/tests/deps.js +++ b/tests/deps.js @@ -153,7 +153,7 @@ goog.addDependency('../../core/renderers/measurables/row_elements.js', ['Blockly goog.addDependency('../../core/renderers/measurables/rows.js', ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.TopRow'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InputConnection', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.Types', 'Blockly.utils.object']); goog.addDependency('../../core/renderers/measurables/types.js', ['Blockly.blockRendering.Types'], [], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/minimalist/constants.js', ['Blockly.minimalist.ConstantProvider'], ['Blockly.blockRendering.ConstantProvider', 'Blockly.utils.object']); -goog.addDependency('../../core/renderers/minimalist/drawer.js', ['Blockly.minimalist.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.minimalist.RenderInfo', 'Blockly.utils.object']); +goog.addDependency('../../core/renderers/minimalist/drawer.js', ['Blockly.minimalist.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'}); goog.addDependency('../../core/renderers/minimalist/info.js', ['Blockly.minimalist', 'Blockly.minimalist.RenderInfo'], ['Blockly.utils.object']); 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']); goog.addDependency('../../core/renderers/thrasos/info.js', ['Blockly.thrasos', 'Blockly.thrasos.RenderInfo'], ['Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);