Migrate core/renderers/minimalist/renderer.js to goog.module syntax (#5365)

* Migrate core/renderers/minimalist/renderer.js to goog.module

* Migrate core/renderers/minimalist/renderer.js to named requires

* clang-format core/renderers/minimalist/renderer.js
This commit is contained in:
Aaron Dodson
2021-08-16 08:24:36 -07:00
committed by GitHub
parent 744e0ecb3d
commit 8e3cf41d2b
2 changed files with 32 additions and 27 deletions

View File

@@ -9,14 +9,19 @@
*/
'use strict';
goog.provide('Blockly.minimalist.Renderer');
goog.module('Blockly.minimalist.Renderer');
goog.module.declareLegacyNamespace();
goog.require('Blockly.blockRendering');
goog.require('Blockly.blockRendering.Renderer');
goog.require('Blockly.minimalist.ConstantProvider');
goog.require('Blockly.minimalist.Drawer');
goog.require('Blockly.minimalist.RenderInfo');
goog.require('Blockly.utils.object');
/* eslint-disable-next-line no-unused-vars */
const BaseRenderInfo = goog.requireType('Blockly.blockRendering.RenderInfo');
const BaseRenderer = goog.require('Blockly.blockRendering.Renderer');
/* eslint-disable-next-line no-unused-vars */
const BlockSvg = goog.requireType('Blockly.BlockSvg');
const ConstantProvider = goog.require('Blockly.minimalist.ConstantProvider');
const Drawer = goog.require('Blockly.minimalist.Drawer');
const RenderInfo = goog.require('Blockly.minimalist.RenderInfo');
const blockRendering = goog.require('Blockly.blockRendering');
const object = goog.require('Blockly.utils.object');
/**
@@ -24,47 +29,47 @@ goog.require('Blockly.utils.object');
* @param {string} name The renderer name.
* @package
* @constructor
* @extends {Blockly.blockRendering.Renderer}
* @extends {BaseRenderer}
*/
Blockly.minimalist.Renderer = function(name) {
Blockly.minimalist.Renderer.superClass_.constructor.call(this, name);
const Renderer = function(name) {
Renderer.superClass_.constructor.call(this, name);
};
Blockly.utils.object.inherits(Blockly.minimalist.Renderer,
Blockly.blockRendering.Renderer);
object.inherits(Renderer, BaseRenderer);
/**
* Create a new instance of the renderer's constant provider.
* @return {!Blockly.minimalist.ConstantProvider} The constant provider.
* @return {!ConstantProvider} The constant provider.
* @protected
* @override
*/
Blockly.minimalist.Renderer.prototype.makeConstants_ = function() {
return new Blockly.minimalist.ConstantProvider();
Renderer.prototype.makeConstants_ = function() {
return new ConstantProvider();
};
/**
* Create a new instance of the renderer's render info object.
* @param {!Blockly.BlockSvg} block The block to measure.
* @return {!Blockly.minimalist.RenderInfo} The render info object.
* @param {!BlockSvg} block The block to measure.
* @return {!RenderInfo} The render info object.
* @protected
* @override
*/
Blockly.minimalist.Renderer.prototype.makeRenderInfo_ = function(block) {
return new Blockly.minimalist.RenderInfo(this, block);
Renderer.prototype.makeRenderInfo_ = function(block) {
return new RenderInfo(this, block);
};
/**
* Create a new instance of the renderer's drawer.
* @param {!Blockly.BlockSvg} block The block to render.
* @param {!Blockly.blockRendering.RenderInfo} info An object containing all
* @param {!BlockSvg} block The block to render.
* @param {!BaseRenderInfo} info An object containing all
* information needed to render this block.
* @return {!Blockly.minimalist.Drawer} The drawer.
* @return {!Drawer} The drawer.
* @protected
* @override
*/
Blockly.minimalist.Renderer.prototype.makeDrawer_ = function(block, info) {
return new Blockly.minimalist.Drawer(block,
/** @type {!Blockly.minimalist.RenderInfo} */ (info));
Renderer.prototype.makeDrawer_ = function(block, info) {
return new Drawer(block, /** @type {!RenderInfo} */ (info));
};
Blockly.blockRendering.register('minimalist', Blockly.minimalist.Renderer);
blockRendering.register('minimalist', Renderer);
exports = Renderer;

View File

@@ -160,7 +160,7 @@ goog.addDependency('../../core/renderers/measurables/types.js', ['Blockly.blockR
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.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/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/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'});