diff --git a/core/renderers/common/constants.js b/core/renderers/common/constants.js index 2d8dd1fb2..c7039b632 100644 --- a/core/renderers/common/constants.js +++ b/core/renderers/common/constants.js @@ -28,6 +28,7 @@ goog.provide('Blockly.blockRendering.ConstantProvider'); goog.require('Blockly.utils.svgPaths'); + /** * An object that provides constants for rendering blocks. * @constructor diff --git a/core/renderers/common/debugger.js b/core/renderers/common/debugger.js index 3e0da16b2..b0b4ff709 100644 --- a/core/renderers/common/debugger.js +++ b/core/renderers/common/debugger.js @@ -26,14 +26,14 @@ goog.provide('Blockly.blockRendering.Debug'); -goog.require('Blockly.blockRendering.RenderInfo'); -goog.require('Blockly.blockRendering.Measurable'); -goog.require('Blockly.blockRendering.Types'); goog.require('Blockly.blockRendering.BottomRow'); goog.require('Blockly.blockRendering.InputRow'); +goog.require('Blockly.blockRendering.Measurable'); +goog.require('Blockly.blockRendering.RenderInfo'); goog.require('Blockly.blockRendering.Row'); goog.require('Blockly.blockRendering.SpacerRow'); goog.require('Blockly.blockRendering.TopRow'); +goog.require('Blockly.blockRendering.Types'); /** diff --git a/core/renderers/common/drawer.js b/core/renderers/common/drawer.js index 704fb41c0..719eaad0e 100644 --- a/core/renderers/common/drawer.js +++ b/core/renderers/common/drawer.js @@ -26,15 +26,15 @@ goog.provide('Blockly.blockRendering.Drawer'); -goog.require('Blockly.blockRendering.Debug'); -goog.require('Blockly.blockRendering.RenderInfo'); -goog.require('Blockly.blockRendering.Measurable'); -goog.require('Blockly.blockRendering.Types'); goog.require('Blockly.blockRendering.BottomRow'); +goog.require('Blockly.blockRendering.Debug'); goog.require('Blockly.blockRendering.InputRow'); +goog.require('Blockly.blockRendering.Measurable'); +goog.require('Blockly.blockRendering.RenderInfo'); goog.require('Blockly.blockRendering.Row'); goog.require('Blockly.blockRendering.SpacerRow'); goog.require('Blockly.blockRendering.TopRow'); +goog.require('Blockly.blockRendering.Types'); goog.require('Blockly.utils.svgPaths'); diff --git a/core/renderers/common/info.js b/core/renderers/common/info.js index c153b6089..ca1f50923 100644 --- a/core/renderers/common/info.js +++ b/core/renderers/common/info.js @@ -26,24 +26,22 @@ goog.provide('Blockly.blockRendering.RenderInfo'); -goog.require('Blockly.blockRendering.Measurable'); -goog.require('Blockly.blockRendering.Types'); goog.require('Blockly.blockRendering.BottomRow'); -goog.require('Blockly.blockRendering.InputRow'); -goog.require('Blockly.blockRendering.Row'); -goog.require('Blockly.blockRendering.SpacerRow'); -goog.require('Blockly.blockRendering.TopRow'); - -goog.require('Blockly.blockRendering.InlineInput'); goog.require('Blockly.blockRendering.ExternalValueInput'); -goog.require('Blockly.blockRendering.StatementInput'); - -goog.require('Blockly.blockRendering.PreviousConnection'); +goog.require('Blockly.blockRendering.InlineInput'); +goog.require('Blockly.blockRendering.InputRow'); +goog.require('Blockly.blockRendering.Measurable'); goog.require('Blockly.blockRendering.NextConnection'); goog.require('Blockly.blockRendering.OutputConnection'); - +goog.require('Blockly.blockRendering.PreviousConnection'); +goog.require('Blockly.blockRendering.Row'); +goog.require('Blockly.blockRendering.SpacerRow'); +goog.require('Blockly.blockRendering.StatementInput'); +goog.require('Blockly.blockRendering.TopRow'); +goog.require('Blockly.blockRendering.Types'); goog.require('Blockly.RenderedConnection'); + /** * An object containing all sizing information needed to draw this block. * diff --git a/core/renderers/common/renderer.js b/core/renderers/common/renderer.js index e197c8faf..ef427fb67 100644 --- a/core/renderers/common/renderer.js +++ b/core/renderers/common/renderer.js @@ -31,6 +31,7 @@ goog.require('Blockly.blockRendering.Debug'); goog.require('Blockly.blockRendering.Drawer'); goog.require('Blockly.blockRendering.RenderInfo'); + /** * The base class for a block renderer. * @package diff --git a/core/renderers/geras/highlight_constants.js b/core/renderers/geras/highlight_constants.js index 162b5644a..fa3550701 100644 --- a/core/renderers/geras/highlight_constants.js +++ b/core/renderers/geras/highlight_constants.js @@ -29,6 +29,7 @@ goog.provide('Blockly.geras.HighlightConstantProvider'); goog.require('Blockly.blockRendering.ConstantProvider'); goog.require('Blockly.utils.svgPaths'); + /** * An object that provides constants for rendering highlights on blocks. * Some highlights are simple offsets of the parent paths and can be generated diff --git a/core/renderers/geras/highlighter.js b/core/renderers/geras/highlighter.js index cd54857c5..ab3a5a1ac 100644 --- a/core/renderers/geras/highlighter.js +++ b/core/renderers/geras/highlighter.js @@ -27,14 +27,14 @@ goog.provide('Blockly.geras.Highlighter'); -goog.require('Blockly.blockRendering.RenderInfo'); -goog.require('Blockly.blockRendering.Measurable'); -goog.require('Blockly.blockRendering.Types'); goog.require('Blockly.blockRendering.BottomRow'); goog.require('Blockly.blockRendering.InputRow'); +goog.require('Blockly.blockRendering.Measurable'); +goog.require('Blockly.blockRendering.RenderInfo'); goog.require('Blockly.blockRendering.Row'); goog.require('Blockly.blockRendering.SpacerRow'); goog.require('Blockly.blockRendering.TopRow'); +goog.require('Blockly.blockRendering.Types'); goog.require('Blockly.utils.svgPaths'); diff --git a/core/renderers/geras/info.js b/core/renderers/geras/info.js index d78400c0d..e7b0e4c44 100644 --- a/core/renderers/geras/info.js +++ b/core/renderers/geras/info.js @@ -28,25 +28,23 @@ goog.provide('Blockly.geras'); goog.provide('Blockly.geras.RenderInfo'); -goog.require('Blockly.blockRendering.RenderInfo'); -goog.require('Blockly.blockRendering.Measurable'); -goog.require('Blockly.blockRendering.Types'); goog.require('Blockly.blockRendering.BottomRow'); -goog.require('Blockly.blockRendering.InputRow'); -goog.require('Blockly.blockRendering.Row'); -goog.require('Blockly.blockRendering.SpacerRow'); -goog.require('Blockly.blockRendering.TopRow'); - -goog.require('Blockly.blockRendering.InlineInput'); goog.require('Blockly.blockRendering.ExternalValueInput'); -goog.require('Blockly.blockRendering.StatementInput'); - -goog.require('Blockly.blockRendering.PreviousConnection'); +goog.require('Blockly.blockRendering.InlineInput'); +goog.require('Blockly.blockRendering.InputRow'); +goog.require('Blockly.blockRendering.Measurable'); goog.require('Blockly.blockRendering.NextConnection'); goog.require('Blockly.blockRendering.OutputConnection'); - +goog.require('Blockly.blockRendering.PreviousConnection'); +goog.require('Blockly.blockRendering.RenderInfo'); +goog.require('Blockly.blockRendering.Row'); +goog.require('Blockly.blockRendering.SpacerRow'); +goog.require('Blockly.blockRendering.StatementInput'); +goog.require('Blockly.blockRendering.TopRow'); +goog.require('Blockly.blockRendering.Types'); goog.require('Blockly.RenderedConnection'); + /** * An object containing all sizing information needed to draw this block. * diff --git a/core/renderers/geras/renderer.js b/core/renderers/geras/renderer.js index f65417ea6..0739d7228 100644 --- a/core/renderers/geras/renderer.js +++ b/core/renderers/geras/renderer.js @@ -33,6 +33,7 @@ goog.require('Blockly.geras.Drawer'); goog.require('Blockly.geras.HighlightConstantProvider'); goog.require('Blockly.geras.RenderInfo'); + /** * The geras renderer. * @package diff --git a/core/renderers/measurables/base.js b/core/renderers/measurables/base.js index 00f7f5e52..6514448e4 100644 --- a/core/renderers/measurables/base.js +++ b/core/renderers/measurables/base.js @@ -29,6 +29,7 @@ goog.provide('Blockly.blockRendering.Measurable'); goog.require('Blockly.blockRendering.Types'); + /** * The base class to represent a part of a block that takes up space during * rendering. The constructor for each non-spacer Measurable records the size diff --git a/core/renderers/measurables/connections.js b/core/renderers/measurables/connections.js index e8168bf63..55dcd443f 100644 --- a/core/renderers/measurables/connections.js +++ b/core/renderers/measurables/connections.js @@ -32,6 +32,7 @@ goog.require('Blockly.blockRendering.Measurable'); goog.require('Blockly.blockRendering.Types'); goog.require('Blockly.RenderedConnection'); + /** * The base class to represent a connection and the space that it takes up on * the block. diff --git a/core/renderers/measurables/inputs.js b/core/renderers/measurables/inputs.js index 81aff973f..79168e592 100644 --- a/core/renderers/measurables/inputs.js +++ b/core/renderers/measurables/inputs.js @@ -24,10 +24,10 @@ * @author fenichel@google.com (Rachel Fenichel) */ -goog.provide('Blockly.blockRendering.InputConnection'); -goog.provide('Blockly.blockRendering.InlineInput'); -goog.provide('Blockly.blockRendering.StatementInput'); goog.provide('Blockly.blockRendering.ExternalValueInput'); +goog.provide('Blockly.blockRendering.InlineInput'); +goog.provide('Blockly.blockRendering.InputConnection'); +goog.provide('Blockly.blockRendering.StatementInput'); goog.require('Blockly.blockRendering.Connection'); goog.require('Blockly.blockRendering.Measurable'); diff --git a/core/renderers/measurables/row_elements.js b/core/renderers/measurables/row_elements.js index e236b5a1b..e790891a1 100644 --- a/core/renderers/measurables/row_elements.js +++ b/core/renderers/measurables/row_elements.js @@ -1,3 +1,28 @@ +/** + * @license + * Visual Blocks Editor + * + * Copyright 2019 Google Inc. + * https://developers.google.com/blockly/ + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/** + * @fileoverview Objects representing elements in a row of a rendered + * block. + * @author fenichel@google.com (Rachel Fenichel) + */ goog.provide('Blockly.blockRendering.Field'); goog.provide('Blockly.blockRendering.Hat'); diff --git a/core/renderers/measurables/rows.js b/core/renderers/measurables/rows.js index 96936a0a3..c5339e16f 100644 --- a/core/renderers/measurables/rows.js +++ b/core/renderers/measurables/rows.js @@ -19,7 +19,7 @@ */ /** - * @fileoverview An object representing a single row on a rendered block and all + * @fileoverview Objects representing a single row on a rendered block and all * of its subcomponents. * @author fenichel@google.com (Rachel Fenichel) */ @@ -38,6 +38,7 @@ goog.require('Blockly.blockRendering.PreviousConnection'); goog.require('Blockly.blockRendering.Types'); goog.require('Blockly.RenderedConnection'); + /** * An object representing a single row on a rendered block and all of its * subcomponents. diff --git a/core/renderers/thrasos/info.js b/core/renderers/thrasos/info.js index 501efd225..67ab76384 100644 --- a/core/renderers/thrasos/info.js +++ b/core/renderers/thrasos/info.js @@ -28,23 +28,20 @@ goog.provide('Blockly.thrasos'); goog.provide('Blockly.thrasos.RenderInfo'); -goog.require('Blockly.blockRendering.RenderInfo'); -goog.require('Blockly.blockRendering.Measurable'); -goog.require('Blockly.blockRendering.Types'); goog.require('Blockly.blockRendering.BottomRow'); -goog.require('Blockly.blockRendering.InputRow'); -goog.require('Blockly.blockRendering.Row'); -goog.require('Blockly.blockRendering.SpacerRow'); -goog.require('Blockly.blockRendering.TopRow'); - -goog.require('Blockly.blockRendering.InlineInput'); goog.require('Blockly.blockRendering.ExternalValueInput'); -goog.require('Blockly.blockRendering.StatementInput'); - -goog.require('Blockly.blockRendering.PreviousConnection'); +goog.require('Blockly.blockRendering.InlineInput'); +goog.require('Blockly.blockRendering.InputRow'); +goog.require('Blockly.blockRendering.Measurable'); goog.require('Blockly.blockRendering.NextConnection'); goog.require('Blockly.blockRendering.OutputConnection'); - +goog.require('Blockly.blockRendering.PreviousConnection'); +goog.require('Blockly.blockRendering.RenderInfo'); +goog.require('Blockly.blockRendering.Row'); +goog.require('Blockly.blockRendering.SpacerRow'); +goog.require('Blockly.blockRendering.StatementInput'); +goog.require('Blockly.blockRendering.TopRow'); +goog.require('Blockly.blockRendering.Types'); goog.require('Blockly.RenderedConnection'); /** diff --git a/core/renderers/zelos/constants.js b/core/renderers/zelos/constants.js index bda2b08d5..d716560bc 100644 --- a/core/renderers/zelos/constants.js +++ b/core/renderers/zelos/constants.js @@ -30,6 +30,7 @@ goog.provide('Blockly.zelos.ConstantProvider'); goog.require('Blockly.blockRendering.ConstantProvider'); goog.require('Blockly.utils.svgPaths'); + /** * An object that provides constants for rendering blocks in Zelos mode. * @constructor @@ -38,7 +39,7 @@ goog.require('Blockly.utils.svgPaths'); */ Blockly.zelos.ConstantProvider = function() { Blockly.zelos.ConstantProvider.superClass_.constructor.call(this); - + this.GRID_UNIT = 4; this.CORNER_RADIUS = 1 * this.GRID_UNIT; diff --git a/core/renderers/zelos/drawer.js b/core/renderers/zelos/drawer.js index e6cb1663c..4bbc68ddc 100644 --- a/core/renderers/zelos/drawer.js +++ b/core/renderers/zelos/drawer.js @@ -201,7 +201,7 @@ Blockly.zelos.Drawer.prototype.drawFlatBottom_ = function() { this.outlinePath_ += Blockly.utils.svgPaths.lineOnAxis('V', bottomRow.baseline); - + this.outlinePath_ += Blockly.utils.svgPaths.lineOnAxis('h', -bottomRow.width); }; diff --git a/core/renderers/zelos/info.js b/core/renderers/zelos/info.js index 770ac6420..7f3289fed 100644 --- a/core/renderers/zelos/info.js +++ b/core/renderers/zelos/info.js @@ -28,30 +28,27 @@ goog.provide('Blockly.zelos'); goog.provide('Blockly.zelos.RenderInfo'); -goog.require('Blockly.blockRendering.RenderInfo'); -goog.require('Blockly.blockRendering.Measurable'); goog.require('Blockly.blockRendering.BottomRow'); -goog.require('Blockly.blockRendering.InputRow'); -goog.require('Blockly.blockRendering.Row'); -goog.require('Blockly.blockRendering.SpacerRow'); -goog.require('Blockly.blockRendering.TopRow'); -goog.require('Blockly.blockRendering.Types'); - -goog.require('Blockly.blockRendering.InlineInput'); goog.require('Blockly.blockRendering.ExternalValueInput'); -goog.require('Blockly.blockRendering.StatementInput'); - -goog.require('Blockly.blockRendering.PreviousConnection'); +goog.require('Blockly.blockRendering.InlineInput'); +goog.require('Blockly.blockRendering.InputRow'); +goog.require('Blockly.blockRendering.Measurable'); goog.require('Blockly.blockRendering.NextConnection'); goog.require('Blockly.blockRendering.OutputConnection'); - +goog.require('Blockly.blockRendering.PreviousConnection'); +goog.require('Blockly.blockRendering.RenderInfo'); +goog.require('Blockly.blockRendering.Row'); +goog.require('Blockly.blockRendering.SpacerRow'); +goog.require('Blockly.blockRendering.StatementInput'); +goog.require('Blockly.blockRendering.TopRow'); +goog.require('Blockly.blockRendering.Types'); goog.require('Blockly.RenderedConnection'); - goog.require('Blockly.zelos.AfterStatementSpacerRow'); goog.require('Blockly.zelos.BeforeStatementSpacerRow'); goog.require('Blockly.zelos.BottomRow'); goog.require('Blockly.zelos.TopRow'); + /** * An object containing all sizing information needed to draw this block. * @@ -350,7 +347,7 @@ Blockly.zelos.RenderInfo.prototype.finalize_ = function() { var widestRowWithConnectedBlocks = 0; for (var i = 0, row; (row = this.rows[i]); i++) { row.xPos = this.startX; - + widestRowWithConnectedBlocks = Math.max(widestRowWithConnectedBlocks, row.widthWithConnectedBlocks); var xCursor = row.xPos; diff --git a/core/renderers/zelos/renderer.js b/core/renderers/zelos/renderer.js index 2919afa21..c2620bfff 100644 --- a/core/renderers/zelos/renderer.js +++ b/core/renderers/zelos/renderer.js @@ -32,6 +32,7 @@ goog.require('Blockly.zelos.ConstantProvider'); goog.require('Blockly.zelos.Drawer'); goog.require('Blockly.zelos.RenderInfo'); + /** * The zelos renderer. * @package