From bfff91b673ea28c0ab20f03e5f3a3cb418c4f041 Mon Sep 17 00:00:00 2001 From: Rachel Fenichel Date: Wed, 6 Nov 2019 11:47:33 -0800 Subject: [PATCH] Update geras and add underscore to setClass_ --- core/renderers/common/path_object.js | 12 ++++++------ core/renderers/geras/path_object.js | 5 +++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/core/renderers/common/path_object.js b/core/renderers/common/path_object.js index 8d276cea7..8e82b2be2 100644 --- a/core/renderers/common/path_object.js +++ b/core/renderers/common/path_object.js @@ -129,7 +129,7 @@ Blockly.blockRendering.PathObject.prototype.setStyle = function(blockStyle) { * be removed. * @protected */ -Blockly.blockRendering.PathObject.prototype.setClass = function( +Blockly.blockRendering.PathObject.prototype.setClass_ = function( className, add) { if (add) { Blockly.utils.dom.addClass(/** @type {!Element} */ (this.svgRoot), @@ -165,7 +165,7 @@ Blockly.blockRendering.PathObject.prototype.updateHighlighted = function( Blockly.blockRendering.PathObject.prototype.updateDisabled = function(disabled, isShadow) { - this.setClass('blocklyDisabled', disabled); + this.setClass_('blocklyDisabled', disabled); if (disabled) { this.svgPath.setAttribute('fill', 'url(#' + this.constants_.disabledPatternId + ')'); @@ -180,7 +180,7 @@ Blockly.blockRendering.PathObject.prototype.updateDisabled = function(disabled, * @package */ Blockly.blockRendering.PathObject.prototype.updateSelected = function(enable) { - this.setClass('blocklySelected', enable); + this.setClass_('blocklySelected', enable); }; /** @@ -191,7 +191,7 @@ Blockly.blockRendering.PathObject.prototype.updateSelected = function(enable) { */ Blockly.blockRendering.PathObject.prototype.updateDraggingDelete = function( enable) { - this.setClass('blocklyDraggingDelete', enable); + this.setClass_('blocklyDraggingDelete', enable); }; /** @@ -202,7 +202,7 @@ Blockly.blockRendering.PathObject.prototype.updateDraggingDelete = function( */ Blockly.blockRendering.PathObject.prototype.updateInsertionMarker = function( enable) { - this.setClass('blocklyInsertionMarker', enable); + this.setClass_('blocklyInsertionMarker', enable); }; /** @@ -211,5 +211,5 @@ Blockly.blockRendering.PathObject.prototype.updateInsertionMarker = function( * @package */ Blockly.blockRendering.PathObject.prototype.updateMovable = function(enable) { - this.setClass('blocklyDraggable', enable); + this.setClass_('blocklyDraggable', enable); }; diff --git a/core/renderers/geras/path_object.js b/core/renderers/geras/path_object.js index f09bdb6aa..5572de4ac 100644 --- a/core/renderers/geras/path_object.js +++ b/core/renderers/geras/path_object.js @@ -153,7 +153,7 @@ Blockly.geras.PathObject.prototype.setStyle = function(blockStyle) { /** * @override */ -Blockly.geras.PathObject.prototype.setHighlighted = function(highlighted) { +Blockly.geras.PathObject.prototype.updateHighlighted = function(highlighted) { if (highlighted) { this.svgPath.setAttribute('filter', 'url(#' + this.constants_.embossFilterId + ')'); @@ -167,7 +167,8 @@ Blockly.geras.PathObject.prototype.setHighlighted = function(highlighted) { /** * @override */ -Blockly.geras.PathObject.prototype.setDisabled = function(disabled, isShadow) { +Blockly.geras.PathObject.prototype.updateDisabled = function( + disabled, isShadow) { if (disabled) { this.svgPath.setAttribute('fill', 'url(#' + this.constants_.disabledPatternId + ')');