Migrate core/renderers/zelos/renderer.js to goog.module

This commit is contained in:
kozbial
2021-08-17 11:15:54 -07:00
committed by Monica Kozbial
parent e7fe63a196
commit 2ea51db549
2 changed files with 19 additions and 17 deletions

View File

@@ -10,7 +10,8 @@
*/
'use strict';
goog.provide('Blockly.zelos.Renderer');
goog.module('Blockly.zelos.Renderer');
goog.module.declareLegacyNamespace();
goog.require('Blockly.blockRendering');
goog.require('Blockly.blockRendering.Renderer');
@@ -23,10 +24,9 @@ goog.require('Blockly.zelos.MarkerSvg');
goog.require('Blockly.zelos.PathObject');
goog.require('Blockly.zelos.RenderInfo');
goog.requireType('Blockly.blockRendering.MarkerSvg');
goog.requireType('Blockly.blockRendering.RenderInfo');
goog.requireType('Blockly.BlockSvg');
goog.requireType('Blockly.Marker');
goog.requireType('Blockly.blockRendering.RenderInfo');
goog.requireType('Blockly.Theme');
goog.requireType('Blockly.WorkspaceSvg');
@@ -38,10 +38,10 @@ goog.requireType('Blockly.WorkspaceSvg');
* @constructor
* @extends {Blockly.blockRendering.Renderer}
*/
Blockly.zelos.Renderer = function(name) {
Blockly.zelos.Renderer.superClass_.constructor.call(this, name);
const Renderer = function(name) {
Renderer.superClass_.constructor.call(this, name);
};
Blockly.utils.object.inherits(Blockly.zelos.Renderer,
Blockly.utils.object.inherits(Renderer,
Blockly.blockRendering.Renderer);
/**
@@ -50,7 +50,7 @@ Blockly.utils.object.inherits(Blockly.zelos.Renderer,
* @protected
* @override
*/
Blockly.zelos.Renderer.prototype.makeConstants_ = function() {
Renderer.prototype.makeConstants_ = function() {
return new Blockly.zelos.ConstantProvider();
};
@@ -61,7 +61,7 @@ Blockly.zelos.Renderer.prototype.makeConstants_ = function() {
* @protected
* @override
*/
Blockly.zelos.Renderer.prototype.makeRenderInfo_ = function(block) {
Renderer.prototype.makeRenderInfo_ = function(block) {
return new Blockly.zelos.RenderInfo(this, block);
};
@@ -74,7 +74,7 @@ Blockly.zelos.Renderer.prototype.makeRenderInfo_ = function(block) {
* @protected
* @override
*/
Blockly.zelos.Renderer.prototype.makeDrawer_ = function(block, info) {
Renderer.prototype.makeDrawer_ = function(block, info) {
return new Blockly.zelos.Drawer(block,
/** @type {!Blockly.zelos.RenderInfo} */ (info));
};
@@ -83,12 +83,12 @@ Blockly.zelos.Renderer.prototype.makeDrawer_ = function(block, info) {
* Create a new instance of the renderer's cursor drawer.
* @param {!Blockly.WorkspaceSvg} workspace The workspace the cursor belongs to.
* @param {!Blockly.Marker} marker The marker.
* @return {!Blockly.blockRendering.MarkerSvg} The object in charge of drawing
* @return {!Blockly.zelos.MarkerSvg} The object in charge of drawing
* the marker.
* @package
* @override
*/
Blockly.zelos.Renderer.prototype.makeMarkerDrawer = function(
Renderer.prototype.makeMarkerDrawer = function(
workspace, marker) {
return new Blockly.zelos.MarkerSvg(workspace, this.getConstants(), marker);
};
@@ -102,7 +102,7 @@ Blockly.zelos.Renderer.prototype.makeMarkerDrawer = function(
* @package
* @override
*/
Blockly.zelos.Renderer.prototype.makePathObject = function(root, style) {
Renderer.prototype.makePathObject = function(root, style) {
return new Blockly.zelos.PathObject(root, style,
/** @type {!Blockly.zelos.ConstantProvider} */ (this.getConstants()));
};
@@ -110,7 +110,7 @@ Blockly.zelos.Renderer.prototype.makePathObject = function(root, style) {
/**
* @override
*/
Blockly.zelos.Renderer.prototype.shouldHighlightConnection = function(conn) {
Renderer.prototype.shouldHighlightConnection = function(conn) {
return conn.type != Blockly.connectionTypes.INPUT_VALUE &&
conn.type !== Blockly.connectionTypes.OUTPUT_VALUE;
};
@@ -118,7 +118,7 @@ Blockly.zelos.Renderer.prototype.shouldHighlightConnection = function(conn) {
/**
* @override
*/
Blockly.zelos.Renderer.prototype.getConnectionPreviewMethod = function(
Renderer.prototype.getConnectionPreviewMethod = function(
closest, local, topBlock) {
if (local.type == Blockly.connectionTypes.OUTPUT_VALUE) {
if (!closest.isConnected()) {
@@ -132,8 +132,10 @@ Blockly.zelos.Renderer.prototype.getConnectionPreviewMethod = function(
return Blockly.InsertionMarkerManager.PREVIEW_TYPE.REPLACEMENT_FADE;
}
return Blockly.zelos.Renderer.superClass_.getConnectionPreviewMethod(
return Renderer.superClass_.getConnectionPreviewMethod(
closest, local, topBlock);
};
Blockly.blockRendering.register('zelos', Blockly.zelos.Renderer);
Blockly.blockRendering.register('zelos', Renderer);
exports = Renderer;

View File

@@ -184,7 +184,7 @@ goog.addDependency('../../core/renderers/zelos/measurables/inputs.js', ['Blockly
goog.addDependency('../../core/renderers/zelos/measurables/row_elements.js', ['Blockly.zelos.RightConnectionShape'], ['Blockly.blockRendering.Measurable', 'Blockly.blockRendering.Types', 'Blockly.utils.object']);
goog.addDependency('../../core/renderers/zelos/measurables/rows.js', ['Blockly.zelos.BottomRow', 'Blockly.zelos.TopRow'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.TopRow', 'Blockly.utils.object']);
goog.addDependency('../../core/renderers/zelos/path_object.js', ['Blockly.zelos.PathObject'], ['Blockly.blockRendering.PathObject', 'Blockly.utils.Svg', 'Blockly.utils.dom', 'Blockly.utils.object'], {'lang': 'es6', 'module': 'goog'});
goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.connectionTypes', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo']);
goog.addDependency('../../core/renderers/zelos/renderer.js', ['Blockly.zelos.Renderer'], ['Blockly.InsertionMarkerManager', 'Blockly.blockRendering', 'Blockly.blockRendering.Renderer', 'Blockly.connectionTypes', 'Blockly.utils.object', 'Blockly.zelos.ConstantProvider', 'Blockly.zelos.Drawer', 'Blockly.zelos.MarkerSvg', 'Blockly.zelos.PathObject', 'Blockly.zelos.RenderInfo'], {'lang': 'es6', 'module': 'goog'});
goog.addDependency('../../core/requires.js', ['Blockly.requires'], ['Blockly', 'Blockly.Comment', 'Blockly.ContextMenuItems', 'Blockly.FieldAngle', 'Blockly.FieldCheckbox', 'Blockly.FieldColour', 'Blockly.FieldDropdown', 'Blockly.FieldImage', 'Blockly.FieldLabelSerializable', 'Blockly.FieldMultilineInput', 'Blockly.FieldNumber', 'Blockly.FieldTextInput', 'Blockly.FieldVariable', 'Blockly.FlyoutButton', 'Blockly.Generator', 'Blockly.HorizontalFlyout', 'Blockly.Mutator', 'Blockly.ShortcutItems', 'Blockly.Themes.Classic', 'Blockly.Toolbox', 'Blockly.Trashcan', 'Blockly.VariablesDynamic', 'Blockly.VerticalFlyout', 'Blockly.Warning', 'Blockly.ZoomControls', 'Blockly.geras.Renderer', 'Blockly.thrasos.Renderer', 'Blockly.zelos.Renderer']);
goog.addDependency('../../core/scrollbar.js', ['Blockly.Scrollbar'], ['Blockly.Touch', 'Blockly.browserEvents', 'Blockly.utils', 'Blockly.utils.Coordinate', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});
goog.addDependency('../../core/scrollbar_pair.js', ['Blockly.ScrollbarPair'], ['Blockly.Events', 'Blockly.Scrollbar', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es6', 'module': 'goog'});