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

Clang-format core/renderers/common/drawer.js and remove unused require

Browse Source
This commit is contained in:
Rachel Fenichel
2021-07-16 11:00:50 -07:00
parent f80764e153
commit d2142a2e9f
2 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
core/renderers/common/drawer.js
View File

@@ -13,7 +13,6 @@
goog.module('Blockly.blockRendering.Drawer');
goog.module.declareLegacyNamespace();
const RenderInfo = goog.require('Blockly.blockRendering.RenderInfo');
const Row = goog.require('Blockly.blockRendering.Row');
const Types = goog.require('Blockly.blockRendering.Types');
const svgPaths = goog.require('Blockly.utils.svgPaths');
@@ -22,6 +21,7 @@ const ConstantProvider = goog.requireType('Blockly.blockRendering.ConstantProvid
const Field = goog.requireType('Blockly.blockRendering.Field');
const Icon = goog.requireType('Blockly.blockRendering.Icon');
const InlineInput = goog.requireType('Blockly.blockRendering.InlineInput');
const RenderInfo = goog.requireType('Blockly.blockRendering.RenderInfo');
const BlockSvg = goog.requireType('Blockly.BlockSvg');
@@ -132,11 +132,9 @@ Drawer.prototype.drawTop_ = function() {
this.outlinePath_ += svgPaths.moveBy(topRow.xPos, this.info_.startY);
for (let i = 0, elem; (elem = elements[i]); i++) {
if (Types.isLeftRoundedCorner(elem)) {
this.outlinePath_ +=
this.constants_.OUTSIDE_CORNERS.topLeft;
this.outlinePath_ += this.constants_.OUTSIDE_CORNERS.topLeft;
} else if (Types.isRightRoundedCorner(elem)) {
this.outlinePath_ +=
this.constants_.OUTSIDE_CORNERS.topRight;
this.outlinePath_ += this.constants_.OUTSIDE_CORNERS.topRight;
} else if (Types.isPreviousConnection(elem)) {
this.outlinePath_ += elem.shape.pathLeft;
} else if (Types.isHat(elem)) {
@@ -163,8 +161,7 @@ Drawer.prototype.drawJaggedEdge_ = function(row) {
/**
* Add steps for an external value input, rendered as a notch in the side
* of the block.
* @param {!Row} row The row that this input
* belongs to.
* @param {!Row} row The row that this input belongs to.
* @protected
*/
Drawer.prototype.drawValueInput_ = function(row) {
@@ -182,8 +179,7 @@ Drawer.prototype.drawValueInput_ = function(row) {
/**
* Add steps for a statement input.
* @param {!Row} row The row that this input
* belongs to.
* @param {!Row} row The row that this input belongs to.
* @protected
*/
Drawer.prototype.drawStatementInput_ = function(row) {
@@ -209,8 +205,7 @@ Drawer.prototype.drawStatementInput_ = function(row) {
/**
* Add steps for the right side of a row that does not have value or
* statement input connections.
* @param {!Row} row The row to draw the
* side of.
* @param {!Row} row The row to draw the side of.
* @protected
*/
Drawer.prototype.drawRightSideRow_ = function(row) {
@@ -375,8 +370,8 @@ Drawer.prototype.positionInlineInputConnection_ = function(input) {
if (this.info_.RTL) {
connX *= -1;
}
input.connectionModel.setOffsetInBlock(connX,
yPos + input.connectionOffsetY);
input.connectionModel.setOffsetInBlock(
connX, yPos + input.connectionOffsetY);
}
};
@@ -452,8 +447,8 @@ Drawer.prototype.positionOutputConnection_ = function() {
if (this.info_.outputConnection) {
const x = this.info_.startX + this.info_.outputConnection.connectionOffsetX;
const connX = this.info_.RTL ? -x : x;
this.block_.outputConnection.setOffsetInBlock(connX,
this.info_.outputConnection.connectionOffsetY);
this.block_.outputConnection.setOffsetInBlock(
connX, this.info_.outputConnection.connectionOffsetY);
}
};

2
tests/deps.js
View File

@@ -116,7 +116,7 @@ goog.addDependency('../../core/rendered_connection.js', ['Blockly.RenderedConnec
goog.addDependency('../../core/renderers/common/block_rendering.js', ['Blockly.blockRendering'], ['Blockly.registry']);
goog.addDependency('../../core/renderers/common/constants.js', ['Blockly.blockRendering.ConstantProvider'], ['Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils', 'Blockly.utils.Svg', 'Blockly.utils.colour', 'Blockly.utils.dom', 'Blockly.utils.svgPaths', 'Blockly.utils.userAgent'], {'lang': 'es5'});
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.constants', 'Blockly.utils.Svg', 'Blockly.utils.dom'], {'lang': 'es5'});
goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering.RenderInfo', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
goog.addDependency('../../core/renderers/common/drawer.js', ['Blockly.blockRendering.Drawer'], ['Blockly.blockRendering.Row', 'Blockly.blockRendering.Types', 'Blockly.utils.svgPaths'], {'lang': 'es6', 'module': 'goog'});
goog.addDependency('../../core/renderers/common/i_path_object.js', ['Blockly.blockRendering.IPathObject'], []);
goog.addDependency('../../core/renderers/common/info.js', ['Blockly.blockRendering.RenderInfo'], ['Blockly.blockRendering.BottomRow', 'Blockly.blockRendering.ExternalValueInput', 'Blockly.blockRendering.Field', 'Blockly.blockRendering.Hat', 'Blockly.blockRendering.InRowSpacer', 'Blockly.blockRendering.InlineInput', 'Blockly.blockRendering.InputRow', 'Blockly.blockRendering.JaggedEdge', 'Blockly.blockRendering.Measurable', 'Blockly.blockRendering.NextConnection', 'Blockly.blockRendering.OutputConnection', 'Blockly.blockRendering.PreviousConnection', 'Blockly.blockRendering.RoundCorner', 'Blockly.blockRendering.Row', 'Blockly.blockRendering.SpacerRow', 'Blockly.blockRendering.SquareCorner', 'Blockly.blockRendering.StatementInput', 'Blockly.blockRendering.TopRow', 'Blockly.blockRendering.Types', 'Blockly.constants', 'Blockly.inputTypes']);
goog.addDependency('../../core/renderers/common/marker_svg.js', ['Blockly.blockRendering.MarkerSvg'], ['Blockly.ASTNode', 'Blockly.Events', 'Blockly.Events.MarkerMove', 'Blockly.connectionTypes', 'Blockly.constants', 'Blockly.utils.Svg', 'Blockly.utils.dom']);