Migrate core/renderers/common/block_rendering.js to goog.module

This commit is contained in:
kozbial
2021-08-09 14:36:00 -07:00
committed by Monica Kozbial
parent 440be28b4a
commit a4a3b6a068
6 changed files with 33 additions and 14 deletions

View File

@@ -14,7 +14,8 @@
* The top level namespace for block rendering.
* @namespace Blockly.blockRendering
*/
goog.provide('Blockly.blockRendering');
goog.module('Blockly.blockRendering');
goog.module.declareLegacyNamespace();
goog.require('Blockly.registry');
@@ -27,7 +28,16 @@ goog.requireType('Blockly.Theme');
* @type {boolean}
* @package
*/
Blockly.blockRendering.useDebugger = false;
let useDebugger = false;
/**
* Returns whether the debugger is turned on.
* @return {boolean} Whether the debugger is turned on.
*/
const isDebuggerEnabled = function() {
return useDebugger;
};
/** @package */
exports.isDebuggerEnabled = isDebuggerEnabled;
/**
* Registers a new renderer.
@@ -36,33 +46,40 @@ Blockly.blockRendering.useDebugger = false;
* to register.
* @throws {Error} if a renderer with the same name has already been registered.
*/
Blockly.blockRendering.register = function(name, rendererClass) {
const register = function(name, rendererClass) {
Blockly.registry.register(Blockly.registry.Type.RENDERER, name,
rendererClass);
};
exports.register = register;
/**
* Unregisters the renderer registered with the given name.
* @param {string} name The name of the renderer.
*/
Blockly.blockRendering.unregister = function(name) {
const unregister = function(name) {
Blockly.registry.unregister(Blockly.registry.Type.RENDERER, name);
};
exports.unregister = unregister;
/**
* Turn on the blocks debugger.
* @package
*/
Blockly.blockRendering.startDebugger = function() {
Blockly.blockRendering.useDebugger = true;
const startDebugger = function() {
useDebugger = true;
};
/** @package */
exports.startDebugger = startDebugger;
/**
* Turn off the blocks debugger.
* @package
*/
Blockly.blockRendering.stopDebugger = function() {
Blockly.blockRendering.useDebugger = false;
const stopDebugger = function() {
useDebugger = false;
};
/** @package */
exports.stopDebugger = stopDebugger;
/**
* Initialize anything needed for rendering (constants, etc).
@@ -74,10 +91,12 @@ Blockly.blockRendering.stopDebugger = function() {
* @package
*/
Blockly.blockRendering.init = function(name, theme, opt_rendererOverrides) {
const init = function(name, theme, opt_rendererOverrides) {
const rendererClass = Blockly.registry.getClass(
Blockly.registry.Type.RENDERER, name);
const renderer = new rendererClass(name);
renderer.init(theme, opt_rendererOverrides);
return renderer;
};
/** @package */
exports.init = init;

View File

@@ -73,7 +73,7 @@ Drawer.prototype.draw = function() {
if (this.info_.RTL) {
this.block_.pathObject.flipRTL();
}
if (Blockly.blockRendering.useDebugger) {
if (Blockly.blockRendering.isDebuggerEnabled()) {
this.block_.renderingDebugger.drawDebug(this.block_, this.info_);
}
this.recordSizeOnBlock_();

View File

@@ -285,7 +285,7 @@ Blockly.blockRendering.Renderer.prototype.getConnectionPreviewMethod = function(
* @package
*/
Blockly.blockRendering.Renderer.prototype.render = function(block) {
if (Blockly.blockRendering.useDebugger && !block.renderingDebugger) {
if (Blockly.blockRendering.isDebuggerEnabled() && !block.renderingDebugger) {
block.renderingDebugger = this.makeDebugger_();
}
var info = this.makeRenderInfo_(block);

View File

@@ -54,7 +54,7 @@ Blockly.geras.Drawer.prototype.draw = function() {
if (this.info_.RTL) {
pathObject.flipRTL();
}
if (Blockly.blockRendering.useDebugger) {
if (Blockly.blockRendering.isDebuggerEnabled()) {
this.block_.renderingDebugger.drawDebug(this.block_, this.info_);
}
this.recordSizeOnBlock_();

View File

@@ -53,7 +53,7 @@ Blockly.zelos.Drawer.prototype.draw = function() {
if (this.info_.RTL) {
pathObject.flipRTL();
}
if (Blockly.blockRendering.useDebugger) {
if (Blockly.blockRendering.isDebuggerEnabled()) {
this.block_.renderingDebugger.drawDebug(this.block_, this.info_);
}
this.recordSizeOnBlock_();

View File

@@ -122,7 +122,7 @@ goog.addDependency('../../core/positionable_helpers.js', ['Blockly.uiPosition'],
goog.addDependency('../../core/procedures.js', ['Blockly.Procedures'], ['Blockly.Blocks', 'Blockly.Events', 'Blockly.Events.BlockChange', 'Blockly.Field', 'Blockly.Msg', 'Blockly.Names', 'Blockly.Workspace', 'Blockly.Xml', 'Blockly.internalConstants', 'Blockly.utils.xml']);
goog.addDependency('../../core/registry.js', ['Blockly.registry'], [], {'lang': 'es6', 'module': 'goog'});
goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnection'], ['Blockly.Connection', 'Blockly.Events', 'Blockly.connectionTypes', 'Blockly.internalConstants', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.deprecation', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.registry']);
goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.registry'], {'lang': 'es6', 'module': 'goog'});
goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.connectionTypes', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es6', 'module': 'goog'});
goog.addDependency('../../core/renderers/common/debugger.js', ['Blockly.blockRendering.Debug'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.connectionTypes', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es5'});
goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});