CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-11 10:57:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
kozbial
2021-08-11 16:27:33 -07:00
committed by Monica Kozbial
parent 7f213b968c
commit 8073b0e282
2 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
core/renderers/zelos/drawer.js
View File

@@ -10,16 +10,18 @@
*/
'use strict';
goog.provide('Blockly.zelos.Drawer');
goog.module('Blockly.zelos.Drawer');
goog.module.declareLegacyNamespace();
goog.require('Blockly.blockRendering');
goog.require('Blockly.blockRendering.Drawer');
goog.require('Blockly.utils.object');
goog.require('Blockly.utils.svgPaths');
goog.require('Blockly.zelos.RenderInfo');
goog.requireType('Blockly.blockRendering.Row');
goog.requireType('Blockly.BlockSvg');
goog.requireType('Blockly.zelos.PathObject');
goog.requireType('Blockly.zelos.RenderInfo');
/**
@@ -31,17 +33,17 @@ goog.requireType('Blockly.zelos.PathObject');
* @constructor
* @extends {Blockly.blockRendering.Drawer}
*/
Blockly.zelos.Drawer = function(block, info) {
Blockly.zelos.Drawer.superClass_.constructor.call(this, block, info);
const Drawer = function(block, info) {
Drawer.superClass_.constructor.call(this, block, info);
};
Blockly.utils.object.inherits(Blockly.zelos.Drawer,
Blockly.utils.object.inherits(Drawer,
Blockly.blockRendering.Drawer);
/**
* @override
*/
Blockly.zelos.Drawer.prototype.draw = function() {
Drawer.prototype.draw = function() {
const pathObject =
/** @type {!Blockly.zelos.PathObject} */ (this.block_.pathObject);
pathObject.beginDrawing();
@@ -68,7 +70,7 @@ Blockly.zelos.Drawer.prototype.draw = function() {
/**
* @override
*/
Blockly.zelos.Drawer.prototype.drawOutline_ = function() {
Drawer.prototype.drawOutline_ = function() {
if (this.info_.outputConnection &&
this.info_.outputConnection.isDynamicShape &&
!this.info_.hasStatementInput &&
@@ -78,19 +80,19 @@ Blockly.zelos.Drawer.prototype.drawOutline_ = function() {
this.drawFlatBottom_();
this.drawLeftDynamicConnection_();
} else {
Blockly.zelos.Drawer.superClass_.drawOutline_.call(this);
Drawer.superClass_.drawOutline_.call(this);
}
};
/**
* @override
*/
Blockly.zelos.Drawer.prototype.drawLeft_ = function() {
Drawer.prototype.drawLeft_ = function() {
if (this.info_.outputConnection &&
this.info_.outputConnection.isDynamicShape) {
this.drawLeftDynamicConnection_();
} else {
Blockly.zelos.Drawer.superClass_.drawLeft_.call(this);
Drawer.superClass_.drawLeft_.call(this);
}
};
@@ -101,7 +103,7 @@ Blockly.zelos.Drawer.prototype.drawLeft_ = function() {
* side of.
* @protected
*/
Blockly.zelos.Drawer.prototype.drawRightSideRow_ = function(row) {
Drawer.prototype.drawRightSideRow_ = function(row) {
if (row.height <= 0) {
return;
}
@@ -127,7 +129,7 @@ Blockly.zelos.Drawer.prototype.drawRightSideRow_ = function(row) {
* Add steps to draw the right side of an output with a dynamic connection.
* @protected
*/
Blockly.zelos.Drawer.prototype.drawRightDynamicConnection_ = function() {
Drawer.prototype.drawRightDynamicConnection_ = function() {
this.outlinePath_ += this.info_.outputConnection.shape.pathRightDown(
this.info_.outputConnection.height);
};
@@ -136,7 +138,7 @@ Blockly.zelos.Drawer.prototype.drawRightDynamicConnection_ = function() {
* Add steps to draw the left side of an output with a dynamic connection.
* @protected
*/
Blockly.zelos.Drawer.prototype.drawLeftDynamicConnection_ = function() {
Drawer.prototype.drawLeftDynamicConnection_ = function() {
this.positionOutputConnection_();
this.outlinePath_ += this.info_.outputConnection.shape.pathUp(
@@ -151,7 +153,7 @@ Blockly.zelos.Drawer.prototype.drawLeftDynamicConnection_ = function() {
* Add steps to draw a flat top row.
* @protected
*/
Blockly.zelos.Drawer.prototype.drawFlatTop_ = function() {
Drawer.prototype.drawFlatTop_ = function() {
const topRow = this.info_.topRow;
this.positionPreviousConnection_();
@@ -165,7 +167,7 @@ Blockly.zelos.Drawer.prototype.drawFlatTop_ = function() {
* Add steps to draw a flat bottom row.
* @protected
*/
Blockly.zelos.Drawer.prototype.drawFlatBottom_ = function() {
Drawer.prototype.drawFlatBottom_ = function() {
const bottomRow = this.info_.bottomRow;
this.positionNextConnection_();
@@ -178,7 +180,7 @@ Blockly.zelos.Drawer.prototype.drawFlatBottom_ = function() {
/**
* @override
*/
Blockly.zelos.Drawer.prototype.drawInlineInput_ = function(input) {
Drawer.prototype.drawInlineInput_ = function(input) {
this.positionInlineInputConnection_(input);
const inputName = input.input.name;
@@ -204,7 +206,7 @@ Blockly.zelos.Drawer.prototype.drawInlineInput_ = function(input) {
/**
* @override
*/
Blockly.zelos.Drawer.prototype.drawStatementInput_ = function(row) {
Drawer.prototype.drawStatementInput_ = function(row) {
const input = row.getLastInput();
// Where to start drawing the notch, which is on the right side in LTR.
const x = input.xPos + input.notchOffset + input.shape.width;
@@ -232,3 +234,5 @@ Blockly.zelos.Drawer.prototype.drawStatementInput_ = function(row) {
this.positionStatementInputConnection_(row);
};
exports = Drawer;

2
tests/deps.js
View File

@@ -164,7 +164,7 @@ goog.addDependency('../../core/renderers/minimalist/renderer.js', ['Blockly.mini
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'});
goog.addDependency('../../core/renderers/zelos/drawer.js', ['Blockly.zelos.Drawer'], ['Blockly.blockRendering.Drawer', 'Blockly.utils.object', 'Blockly.utils.svgPaths', 'Blockly.zelos.RenderInfo']);
goog.addDependency('../../core/renderers/zelos/drawer.js', ['Blockly.zelos.Drawer'], ['Blockly.blockRendering', 'Blockly.blockRendering.Drawer', 'Blockly.utils.object', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
goog.addDependency('../../core/renderers/zelos/info.js', ['Blockly.zelos', 'Blockly.zelos.RenderInfo'], ['Blockly.FieldImage', 'Blockly.FieldLabel', 'Blockly.FieldTextInput', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Types', 'Blockly.inputTypes', 'Blockly.utils.object', 'Blockly.zelos.BottomRow', 'Blockly.zelos.RightConnectionShape', 'Blockly.zelos.TopRow']);
goog.addDependency('../../core/renderers/zelos/marker_svg.js', ['Blockly.zelos.MarkerSvg'], ['Blockly.blockRendering.MarkerSvg', 'Blockly.utils.Svg', 'Blockly.utils.dom']);
goog.addDependency('../../core/renderers/zelos/measurables/inputs.js', ['Blockly.zelos.StatementInput'], ['Blockly.blockRendering.StatementInput', 'Blockly.utils.object']);