From 59e2111add1a7f866b624bc5ecc66af750cebd0d Mon Sep 17 00:00:00 2001 From: Marla Schulz Date: Thu, 26 May 2022 15:44:44 -0600 Subject: [PATCH] Fix adjacent overload signatures, see: https://github.com/phetsims/chipper/issues/1250 --- js/Drawer.ts | 3 ++- js/EyeDropperNode.ts | 7 ++++--- js/NumberDisplay.ts | 8 ++++---- js/ValueGaugeNode.ts | 3 ++- 4 files changed, 12 insertions(+), 9 deletions(-) diff --git a/js/Drawer.ts b/js/Drawer.ts index d8e181030..78a326c0e 100644 --- a/js/Drawer.ts +++ b/js/Drawer.ts @@ -285,6 +285,8 @@ export default class Drawer extends Node { set animationEnabled( value ) { this.setAnimationEnabled( value ); } + get animationEnabled() { return this.getAnimationEnabled(); } + /** * Is animation enabled for opening/closing drawer? */ @@ -292,7 +294,6 @@ export default class Drawer extends Node { return this._animationEnabled; } - get animationEnabled() { return this.getAnimationEnabled(); } } sceneryPhet.register( 'Drawer', Drawer ); \ No newline at end of file diff --git a/js/EyeDropperNode.ts b/js/EyeDropperNode.ts index d1fdfe5af..115330063 100644 --- a/js/EyeDropperNode.ts +++ b/js/EyeDropperNode.ts @@ -167,6 +167,10 @@ export default class EyeDropperNode extends Node { this.setFluidColor( value ); } + get fluidColor() { + return this.getFluidColor(); + } + /** * Gets the color of the fluid in the dropper. */ @@ -174,9 +178,6 @@ export default class EyeDropperNode extends Node { return this.fluidNode.fill; } - get fluidColor() { - return this.getFluidColor(); - } } sceneryPhet.register( 'EyeDropperNode', EyeDropperNode ); \ No newline at end of file diff --git a/js/NumberDisplay.ts b/js/NumberDisplay.ts index 78f07f146..ccdfa628f 100644 --- a/js/NumberDisplay.ts +++ b/js/NumberDisplay.ts @@ -287,6 +287,10 @@ export default class NumberDisplay extends Node { set backgroundFill( value: IPaint ) { this.setBackgroundFill( value ); } + get backgroundFill(): IPaint { + return this.getBackgroundFill(); + } + /** * Gets the background fill. */ @@ -294,10 +298,6 @@ export default class NumberDisplay extends Node { return this.backgroundNode.fill; } - get backgroundFill(): IPaint { - return this.getBackgroundFill(); - } - /** * Sets the background stroke. */ diff --git a/js/ValueGaugeNode.ts b/js/ValueGaugeNode.ts index af008873c..98daf4976 100644 --- a/js/ValueGaugeNode.ts +++ b/js/ValueGaugeNode.ts @@ -78,6 +78,8 @@ export default class ValueGaugeNode extends GaugeNode { set numberDisplayVisible( visible ) { this.setNumberDisplayVisible( visible ); } + get numberDisplayVisible() { return this.getNumberDisplayVisible(); } + /** * Gets the visibility of the gauge's NumberDisplay. */ @@ -85,7 +87,6 @@ export default class ValueGaugeNode extends GaugeNode { return this._numberDisplayVisible; } - get numberDisplayVisible() { return this.getNumberDisplayVisible(); } public override dispose(): void { this.numberDisplay.dispose();