Skip to content

Commit

Permalink
Remove isVariabilityScreen, see #153
Browse files Browse the repository at this point in the history
  • Loading branch information
samreid committed Apr 25, 2023
1 parent b4012e4 commit 61ff9db
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 6 deletions.
1 change: 0 additions & 1 deletion js/common/view/CAVScreenView.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ import KickButtonGroup from './KickButtonGroup.js';
type SelfOptions = {
bottomCheckboxGroupOptions?: StrictOmit<BottomRepresentationCheckboxGroupOptions, 'tandem'>;
questionBarOptions: QuestionBarOptions;
isVariabilityScreen: boolean;
};

export type CAVScreenViewOptions = SelfOptions & ScreenViewOptions;
Expand Down
1 change: 0 additions & 1 deletion js/mean-and-median/MeanAndMedianScreen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ export default class MeanAndMedianScreen extends CAVScreen<MeanAndMedianModel, M
dataPointFill: 'black'
} ),
model => new MeanAndMedianScreenView( model, {
isVariabilityScreen: false,
tandem: options.tandem.createTandem( 'view' )
} ),
options
Expand Down
3 changes: 1 addition & 2 deletions js/median/view/MedianScreenView.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,13 @@ import Tandem from '../../../../tandem/js/Tandem.js';
type SelfOptions = EmptySelfOptions;
type MedianScreenViewOptions =
SelfOptions
& StrictOmit<CAVScreenViewOptions, 'isVariabilityScreen' | 'questionBarOptions'>;
& StrictOmit<CAVScreenViewOptions, 'questionBarOptions'>;

export default class MedianScreenView extends CAVScreenView {

public constructor( model: MedianModel, providedOptions: MedianScreenViewOptions ) {

const options = optionize<MedianScreenViewOptions, SelfOptions, CAVScreenViewOptions>()( {
isVariabilityScreen: false,
questionBarOptions: {
barFill: CAVColors.medianQuestionBarFillColorProperty,
questionString: CenterAndVariabilityStrings.medianQuestionStringProperty
Expand Down
3 changes: 1 addition & 2 deletions js/variability/view/VariabilityScreenView.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ const TEXT_OPTIONS = {
};

type SelfOptions = EmptySelfOptions;
type VariabilityScreenViewOptions = SelfOptions & StrictOmit<CAVScreenViewOptions, 'questionBarOptions' | 'isVariabilityScreen'>;
type VariabilityScreenViewOptions = SelfOptions & StrictOmit<CAVScreenViewOptions, 'questionBarOptions'>;

export default class VariabilityScreenView extends CAVScreenView {

Expand All @@ -55,7 +55,6 @@ export default class VariabilityScreenView extends CAVScreenView {
const accordionBoxTitleProperty = new DynamicProperty<string, unknown, unknown>( currentProperty );

const options = optionize<VariabilityScreenViewOptions, SelfOptions, CAVScreenViewOptions>()( {
isVariabilityScreen: true,
questionBarOptions: {
barFill: CAVColors.variabilityQuestionBarFillColorProperty,
questionString: CenterAndVariabilityStrings.variabilityQuestionStringProperty
Expand Down

0 comments on commit 61ff9db

Please sign in to comment.