From 8475976103f39f37be5223a99cafb0d9132d6fe9 Mon Sep 17 00:00:00 2001 From: Sam El-Husseini Date: Fri, 24 Jan 2020 13:02:27 -0800 Subject: [PATCH] Fix start hats (#3651) --- core/renderers/common/info.js | 2 +- core/renderers/measurables/rows.js | 2 +- core/renderers/zelos/measurables/rows.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/renderers/common/info.js b/core/renderers/common/info.js index ec63bce6c..0e20b9b24 100644 --- a/core/renderers/common/info.js +++ b/core/renderers/common/info.js @@ -262,7 +262,7 @@ Blockly.blockRendering.RenderInfo.prototype.createRows_ = function() { */ Blockly.blockRendering.RenderInfo.prototype.populateTopRow_ = function() { var hasPrevious = !!this.block_.previousConnection; - var hasHat = (typeof this.block_.hat !== 'undefined' ? + var hasHat = (this.block_.hat ? this.block_.hat === 'cap' : this.constants_.ADD_START_HATS) && !this.outputConnection && !hasPrevious; var leftSquareCorner = this.topRow.hasLeftSquareCorner(this.block_); diff --git a/core/renderers/measurables/rows.js b/core/renderers/measurables/rows.js index 6a86f3fa4..254b31e95 100644 --- a/core/renderers/measurables/rows.js +++ b/core/renderers/measurables/rows.js @@ -290,7 +290,7 @@ Blockly.utils.object.inherits(Blockly.blockRendering.TopRow, * @return {boolean} Whether or not the top row has a left square corner. */ Blockly.blockRendering.TopRow.prototype.hasLeftSquareCorner = function(block) { - var hasHat = (typeof block.hat !== 'undefined' ? + var hasHat = (block.hat ? block.hat === 'cap' : this.constants_.ADD_START_HATS) && !block.outputConnection && !block.previousConnection; var prevBlock = block.getPreviousBlock(); diff --git a/core/renderers/zelos/measurables/rows.js b/core/renderers/zelos/measurables/rows.js index 64c5836b8..5b025eda2 100644 --- a/core/renderers/zelos/measurables/rows.js +++ b/core/renderers/zelos/measurables/rows.js @@ -62,7 +62,7 @@ Blockly.zelos.TopRow.prototype.endsWithElemSpacer = function() { * @override */ Blockly.zelos.TopRow.prototype.hasLeftSquareCorner = function(block) { - var hasHat = (typeof block.hat !== 'undefined' ? + var hasHat = (block.hat ? block.hat === 'cap' : this.constants_.ADD_START_HATS) && !block.outputConnection && !block.previousConnection; return !!block.outputConnection || hasHat;