From a4a3b6a068536f5662469e103dda81cbf682fe8e Mon Sep 17 00:00:00 2001 From: kozbial Date: Mon, 9 Aug 2021 14:36:00 -0700 Subject: [PATCH] Migrate core/renderers/common/block_rendering.js to goog.module --- core/renderers/common/block_rendering.js | 37 ++++++++++++++++++------ core/renderers/common/drawer.js | 2 +- core/renderers/common/renderer.js | 2 +- core/renderers/geras/drawer.js | 2 +- core/renderers/zelos/drawer.js | 2 +- tests/deps.js | 2 +- 6 files changed, 33 insertions(+), 14 deletions(-) diff --git a/core/renderers/common/block_rendering.js b/core/renderers/common/block_rendering.js index 8ff48cb86..5dc8d33f8 100644 --- a/core/renderers/common/block_rendering.js +++ b/core/renderers/common/block_rendering.js @@ -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; diff --git a/core/renderers/common/drawer.js b/core/renderers/common/drawer.js index 2dde92d3f..92e659ab7 100644 --- a/core/renderers/common/drawer.js +++ b/core/renderers/common/drawer.js @@ -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_(); diff --git a/core/renderers/common/renderer.js b/core/renderers/common/renderer.js index 37e4a883a..b4be1af87 100644 --- a/core/renderers/common/renderer.js +++ b/core/renderers/common/renderer.js @@ -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); diff --git a/core/renderers/geras/drawer.js b/core/renderers/geras/drawer.js index 360d123ce..b1ebc59a6 100644 --- a/core/renderers/geras/drawer.js +++ b/core/renderers/geras/drawer.js @@ -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_(); diff --git a/core/renderers/zelos/drawer.js b/core/renderers/zelos/drawer.js index 20bad30e4..be1a4fa04 100644 --- a/core/renderers/zelos/drawer.js +++ b/core/renderers/zelos/drawer.js @@ -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_(); diff --git a/tests/deps.js b/tests/deps.js index 2a958d44f..4ab382ba8 100644 --- a/tests/deps.js +++ b/tests/deps.js @@ -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'});