From 0a7093a075d61492f85aa2b9020d46f294b592c8 Mon Sep 17 00:00:00 2001 From: pixelzoom Date: Tue, 27 Feb 2024 16:58:32 -0700 Subject: [PATCH] remove uses of TANDEM_NAME_SUFFIX, https://github.com/phetsims/projectile-data-lab/issues/203 --- js/common/view/EnvironmentRadioButtonGroup.ts | 5 ++--- js/common/view/GraphChoiceRadioButtonGroup.ts | 9 ++++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/js/common/view/EnvironmentRadioButtonGroup.ts b/js/common/view/EnvironmentRadioButtonGroup.ts index 57283767..0a2315ed 100644 --- a/js/common/view/EnvironmentRadioButtonGroup.ts +++ b/js/common/view/EnvironmentRadioButtonGroup.ts @@ -12,7 +12,6 @@ import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; import { Node, NodeTranslationOptions, Path, Rectangle } from '../../../../scenery/js/imports.js'; import snowflakeSolidShape from '../../../../sherpa/js/fontawesome-5/snowflakeSolidShape.js'; import sunSolidShape from '../../../../sherpa/js/fontawesome-5/sunSolidShape.js'; -import RectangularRadioButton from '../../../../sun/js/buttons/RectangularRadioButton.js'; import RectangularRadioButtonGroup, { RectangularRadioButtonGroupOptions } from '../../../../sun/js/buttons/RectangularRadioButtonGroup.js'; import Tandem from '../../../../tandem/js/Tandem.js'; import naturalSelection from '../../naturalSelection.js'; @@ -84,12 +83,12 @@ export default class EnvironmentRadioButtonGroup extends RectangularRadioButtonG { value: Environment.EQUATOR, createNode: ( tandem: Tandem ) => equatorButtonContent, - tandemName: `equator${RectangularRadioButton.TANDEM_NAME_SUFFIX}` + tandemName: 'equatorRadioButton' }, { value: Environment.ARCTIC, createNode: ( tandem: Tandem ) => arcticButtonContent, - tandemName: `arctic${RectangularRadioButton.TANDEM_NAME_SUFFIX}` + tandemName: 'arcticRadioButton' } ]; diff --git a/js/common/view/GraphChoiceRadioButtonGroup.ts b/js/common/view/GraphChoiceRadioButtonGroup.ts index 20f94107..3f220b14 100644 --- a/js/common/view/GraphChoiceRadioButtonGroup.ts +++ b/js/common/view/GraphChoiceRadioButtonGroup.ts @@ -11,7 +11,6 @@ import optionize, { EmptySelfOptions } from '../../../../phet-core/js/optionize. import PickRequired from '../../../../phet-core/js/types/PickRequired.js'; import StrictOmit from '../../../../phet-core/js/types/StrictOmit.js'; import { Text, TextOptions } from '../../../../scenery/js/imports.js'; -import AquaRadioButton from '../../../../sun/js/AquaRadioButton.js'; import VerticalAquaRadioButtonGroup, { VerticalAquaRadioButtonGroupOptions } from '../../../../sun/js/VerticalAquaRadioButtonGroup.js'; import naturalSelection from '../../naturalSelection.js'; import NaturalSelectionStrings from '../../NaturalSelectionStrings.js'; @@ -49,28 +48,28 @@ export default class GraphChoiceRadioButtonGroup extends VerticalAquaRadioButton { value: GraphChoice.POPULATION, createNode: () => new Text( NaturalSelectionStrings.populationStringProperty, TEXT_OPTIONS ), - tandemName: `population${AquaRadioButton.TANDEM_NAME_SUFFIX}` + tandemName: 'populationRadioButton' }, // Proportions { value: GraphChoice.PROPORTIONS, createNode: () => new Text( NaturalSelectionStrings.proportionsStringProperty, TEXT_OPTIONS ), - tandemName: `proportions${AquaRadioButton.TANDEM_NAME_SUFFIX}` + tandemName: 'proportionsRadioButton' }, // Pedigree { value: GraphChoice.PEDIGREE, createNode: () => new Text( NaturalSelectionStrings.pedigreeStringProperty, TEXT_OPTIONS ), - tandemName: `pedigree${AquaRadioButton.TANDEM_NAME_SUFFIX}` + tandemName: 'pedigreeRadioButton' }, // None { value: GraphChoice.NONE, createNode: () => new Text( NaturalSelectionStrings.noneStringProperty, TEXT_OPTIONS ), - tandemName: `none${AquaRadioButton.TANDEM_NAME_SUFFIX}` + tandemName: 'noneRadioButton' } ];