From e9d5849a0637ea6b11cb168c9e7108991ce5d699 Mon Sep 17 00:00:00 2001 From: pixelzoom Date: Tue, 3 Dec 2024 13:27:42 -0700 Subject: [PATCH] Rename allUrl to allURL, https://github.com/phetsims/number-pairs/issues/22 --- js/common/model/NumberSuiteCommonPreferences.ts | 6 +++--- js/common/view/NumberSuiteCommonPreferencesNode.ts | 2 +- js/common/view/SecondLanguageControl.ts | 14 +++++++------- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/js/common/model/NumberSuiteCommonPreferences.ts b/js/common/model/NumberSuiteCommonPreferences.ts index c67e50e..6f7bb74 100644 --- a/js/common/model/NumberSuiteCommonPreferences.ts +++ b/js/common/model/NumberSuiteCommonPreferences.ts @@ -52,9 +52,9 @@ class NumberSuiteCommonPreferences { public readonly secondLocaleStringsProperty: TReadOnlyProperty; // URL to the {REPO}_all.html file for this simulation. - public readonly allUrl: string; + public readonly allURL: string; - public constructor( allUrl: string ) { + public constructor( allURL: string ) { // if a valid second locale was provided via a query parameter, display the second locale on sim startup this.showSecondLocaleProperty = new BooleanProperty( !!NumberSuiteCommonQueryParameters.secondLocale ); @@ -76,7 +76,7 @@ class NumberSuiteCommonPreferences { return phet.chipper.strings[ secondLocale ]; } ); - this.allUrl = allUrl; + this.allURL = allURL; } public dispose(): void { diff --git a/js/common/view/NumberSuiteCommonPreferencesNode.ts b/js/common/view/NumberSuiteCommonPreferencesNode.ts index 24a6a9e..a3a0ab0 100644 --- a/js/common/view/NumberSuiteCommonPreferencesNode.ts +++ b/js/common/view/NumberSuiteCommonPreferencesNode.ts @@ -42,7 +42,7 @@ export default class NumberSuiteCommonPreferencesNode extends HBox { align: 'top' }, providedOptions ); - const secondLanguageControl = new SecondLanguageControl( preferences, preferences.allUrl, utteranceQueue, { + const secondLanguageControl = new SecondLanguageControl( preferences, preferences.allURL, utteranceQueue, { visible: options.secondLanguageControlEnabled } ); diff --git a/js/common/view/SecondLanguageControl.ts b/js/common/view/SecondLanguageControl.ts index 0724c62..39c9f3d 100644 --- a/js/common/view/SecondLanguageControl.ts +++ b/js/common/view/SecondLanguageControl.ts @@ -39,12 +39,12 @@ export default class SecondLanguageControl extends VBox { /** * @param secondLanguageProperties - * @param allUrl - URL to the {REPO}_all.html file for this simulation. + * @param allURL - URL to the {REPO}_all.html file for this simulation. * @param utteranceQueue * @param [providedOptions] */ public constructor( secondLanguageProperties: SecondLanguageProperties, - allUrl: string, + allURL: string, utteranceQueue: NumberSuiteCommonUtteranceQueue, providedOptions?: SecondLanguageControlOptions ) { @@ -75,7 +75,7 @@ export default class SecondLanguageControl extends VBox { } ); // Additional description that is visible when the Second Language control is disabled. - const additionalDescriptionNode = new AdditionalDescriptionNode( !preferencesControl.enabled, allUrl ); + const additionalDescriptionNode = new AdditionalDescriptionNode( !preferencesControl.enabled, allURL ); // Control for choosing a second language and associated voice const languageAndVoiceControl = new LanguageAndVoiceControl( @@ -125,9 +125,9 @@ class AdditionalDescriptionNode extends VBox { /** * @param visible - * @param allUrl - URL to the {REPO}_all.html file for this simulation. + * @param allURL - URL to the {REPO}_all.html file for this simulation. */ - public constructor( visible: boolean, allUrl: string ) { + public constructor( visible: boolean, allURL: string ) { const toDisplayASecondLanguageText = new RichText( NumberSuiteCommonStrings.toDisplayASecondLanguageDescriptionStringProperty, { font: new PhetFont( 12 ), @@ -136,10 +136,10 @@ class AdditionalDescriptionNode extends VBox { // If links are not allowed, show the URL as plain text. const urlStringProperty = new DerivedProperty( [ allowLinksProperty ], - allowLinks => allowLinks ? `${allUrl}` : allUrl + allowLinks => allowLinks ? `${allURL}` : allURL ); const urlText = new RichText( urlStringProperty, { - links: { url: allUrl }, + links: { url: allURL }, font: new PhetFont( 12 ), maxWidth: PreferencesDialog.CONTENT_MAX_WIDTH } );