From 73bfb89cf31bc0a276d4ef2d8f360fda2fe51f89 Mon Sep 17 00:00:00 2001 From: Marla Schulz Date: Wed, 7 Sep 2022 11:58:36 -0700 Subject: [PATCH] Move screenViewRoot to base class, see: https://github.com/phetsims/mean-share-and-balance/issues/76` --- js/JohnTravoltageStrings.ts | 6 +-- js/john-travoltage-main.js | 4 +- js/john-travoltage/AppendageRangeMaps.js | 40 +++++++++---------- js/john-travoltage/view/ArmNode.js | 6 +-- js/john-travoltage/view/ElectronLayerNode.js | 6 +-- .../view/JohnTravoltageKeyboardHelpContent.js | 12 +++--- js/john-travoltage/view/JohnTravoltageView.js | 28 ++++++------- js/john-travoltage/view/LegNode.js | 8 ++-- 8 files changed, 55 insertions(+), 55 deletions(-) diff --git a/js/JohnTravoltageStrings.ts b/js/JohnTravoltageStrings.ts index 40f3069..be1e723 100644 --- a/js/JohnTravoltageStrings.ts +++ b/js/JohnTravoltageStrings.ts @@ -139,8 +139,8 @@ type StringsType = { } }; -const johnTravoltageStrings = getStringModule( 'JOHN_TRAVOLTAGE' ) as StringsType; +const JohnTravoltageStrings = getStringModule( 'JOHN_TRAVOLTAGE' ) as StringsType; -johnTravoltage.register( 'johnTravoltageStrings', johnTravoltageStrings ); +johnTravoltage.register( 'JohnTravoltageStrings', JohnTravoltageStrings ); -export default johnTravoltageStrings; +export default JohnTravoltageStrings; diff --git a/js/john-travoltage-main.js b/js/john-travoltage-main.js index f4e652a..eeb98cb 100644 --- a/js/john-travoltage-main.js +++ b/js/john-travoltage-main.js @@ -11,9 +11,9 @@ import Sim from '../../joist/js/Sim.js'; import simLauncher from '../../joist/js/simLauncher.js'; import Tandem from '../../tandem/js/Tandem.js'; import JohnTravoltageScreen from './john-travoltage/JohnTravoltageScreen.js'; -import johnTravoltageStrings from './johnTravoltageStrings.js'; +import JohnTravoltageStrings from './JohnTravoltageStrings.js'; -const johnTravoltageTitleStringProperty = johnTravoltageStrings[ 'john-travoltage' ].titleStringProperty; +const johnTravoltageTitleStringProperty = JohnTravoltageStrings[ 'john-travoltage' ].titleStringProperty; //Workaround for #30 const newChild = document.createElement( 'audio' ); diff --git a/js/john-travoltage/AppendageRangeMaps.js b/js/john-travoltage/AppendageRangeMaps.js index b2ba237..12d13d8 100644 --- a/js/john-travoltage/AppendageRangeMaps.js +++ b/js/john-travoltage/AppendageRangeMaps.js @@ -9,29 +9,29 @@ import Range from '../../../dot/js/Range.js'; import johnTravoltage from '../johnTravoltage.js'; -import johnTravoltageStrings from '../johnTravoltageStrings.js'; +import JohnTravoltageStrings from '../JohnTravoltageStrings.js'; -const farthestFromDoorknobString = johnTravoltageStrings.a11y.appendages.arm.positions.farthestFromDoorknob; -const veryFarFromDoorknobString = johnTravoltageStrings.a11y.appendages.arm.positions.veryFarFromDoorknob; -const farFromDoorknobString = johnTravoltageStrings.a11y.appendages.arm.positions.farFromDoorknob; -const notSoCloseToDoorknobString = johnTravoltageStrings.a11y.appendages.arm.positions.notSoCloseToDoorknob; -const closeToDoorknobString = johnTravoltageStrings.a11y.appendages.arm.positions.closeToDoorknob; -const veryCloseToDoorknobString = johnTravoltageStrings.a11y.appendages.arm.positions.veryCloseToDoorknob; -const justAboveDoorknobString = johnTravoltageStrings.a11y.appendages.arm.positions.justAboveDoorknob; -const atDoorknobString = johnTravoltageStrings.a11y.appendages.arm.positions.atDoorknob; -const justBelowDoorknobString = johnTravoltageStrings.a11y.appendages.arm.positions.justBelowDoorknob; +const farthestFromDoorknobString = JohnTravoltageStrings.a11y.appendages.arm.positions.farthestFromDoorknob; +const veryFarFromDoorknobString = JohnTravoltageStrings.a11y.appendages.arm.positions.veryFarFromDoorknob; +const farFromDoorknobString = JohnTravoltageStrings.a11y.appendages.arm.positions.farFromDoorknob; +const notSoCloseToDoorknobString = JohnTravoltageStrings.a11y.appendages.arm.positions.notSoCloseToDoorknob; +const closeToDoorknobString = JohnTravoltageStrings.a11y.appendages.arm.positions.closeToDoorknob; +const veryCloseToDoorknobString = JohnTravoltageStrings.a11y.appendages.arm.positions.veryCloseToDoorknob; +const justAboveDoorknobString = JohnTravoltageStrings.a11y.appendages.arm.positions.justAboveDoorknob; +const atDoorknobString = JohnTravoltageStrings.a11y.appendages.arm.positions.atDoorknob; +const justBelowDoorknobString = JohnTravoltageStrings.a11y.appendages.arm.positions.justBelowDoorknob; -const handPointingAwayString = johnTravoltageStrings.a11y.appendages.arm.positions.handPointingAway; -const handPointingStraightUpString = johnTravoltageStrings.a11y.appendages.arm.positions.handPointingStraightUp; -const handPointingAtUpperDoorString = johnTravoltageStrings.a11y.appendages.arm.positions.handPointingAtUpperDoor; -const handPointingAtLowerDoorString = johnTravoltageStrings.a11y.appendages.arm.positions.handPointingAtLowerDoor; -const handPointingStraightDownString = johnTravoltageStrings.a11y.appendages.arm.positions.handPointingStraightDown; -const farthestFromDoorknobLastString = johnTravoltageStrings.a11y.appendages.arm.positions.farthestFromDoorknobLast; +const handPointingAwayString = JohnTravoltageStrings.a11y.appendages.arm.positions.handPointingAway; +const handPointingStraightUpString = JohnTravoltageStrings.a11y.appendages.arm.positions.handPointingStraightUp; +const handPointingAtUpperDoorString = JohnTravoltageStrings.a11y.appendages.arm.positions.handPointingAtUpperDoor; +const handPointingAtLowerDoorString = JohnTravoltageStrings.a11y.appendages.arm.positions.handPointingAtLowerDoor; +const handPointingStraightDownString = JohnTravoltageStrings.a11y.appendages.arm.positions.handPointingStraightDown; +const farthestFromDoorknobLastString = JohnTravoltageStrings.a11y.appendages.arm.positions.farthestFromDoorknobLast; -const footOffRugPointingBackwardsString = johnTravoltageStrings.a11y.appendages.leg.positions.footOffRugPointingBackwards; -const footOffRugString = johnTravoltageStrings.a11y.appendages.leg.positions.footOffRug; -const footRubbingOnRugString = johnTravoltageStrings.a11y.appendages.leg.positions.footRubbingOnRug; -const footOffRugPointingForwardString = johnTravoltageStrings.a11y.appendages.leg.positions.footOffRugPointingForward; +const footOffRugPointingBackwardsString = JohnTravoltageStrings.a11y.appendages.leg.positions.footOffRugPointingBackwards; +const footOffRugString = JohnTravoltageStrings.a11y.appendages.leg.positions.footOffRug; +const footRubbingOnRugString = JohnTravoltageStrings.a11y.appendages.leg.positions.footRubbingOnRug; +const footOffRugPointingForwardString = JohnTravoltageStrings.a11y.appendages.leg.positions.footOffRugPointingForward; const AppendageRangeMaps = { diff --git a/js/john-travoltage/view/ArmNode.js b/js/john-travoltage/view/ArmNode.js index 8834349..ec4ca53 100644 --- a/js/john-travoltage/view/ArmNode.js +++ b/js/john-travoltage/view/ArmNode.js @@ -8,13 +8,13 @@ import LinearFunction from '../../../../dot/js/LinearFunction.js'; import merge from '../../../../phet-core/js/merge.js'; import arm_png from '../../../images/arm_png.js'; import johnTravoltage from '../../johnTravoltage.js'; -import johnTravoltageStrings from '../../johnTravoltageStrings.js'; +import JohnTravoltageStrings from '../../JohnTravoltageStrings.js'; import AppendageRangeMaps from '../AppendageRangeMaps.js'; import AppendageNode from './AppendageNode.js'; // constants -const handInteractionHintString = johnTravoltageStrings.a11y.voicing.handInteractionHint; -const appendageArmLabelString = johnTravoltageStrings.a11y.appendages.arm.label; +const handInteractionHintString = JohnTravoltageStrings.a11y.voicing.handInteractionHint; +const appendageArmLabelString = JohnTravoltageStrings.a11y.appendages.arm.label; class ArmNode extends AppendageNode { diff --git a/js/john-travoltage/view/ElectronLayerNode.js b/js/john-travoltage/view/ElectronLayerNode.js index 71028ca..48f30ef 100644 --- a/js/john-travoltage/view/ElectronLayerNode.js +++ b/js/john-travoltage/view/ElectronLayerNode.js @@ -14,11 +14,11 @@ import StringUtils from '../../../../phetcommon/js/util/StringUtils.js'; import { Node, Voicing } from '../../../../scenery/js/imports.js'; import Utterance from '../../../../utterance-queue/js/Utterance.js'; import johnTravoltage from '../../johnTravoltage.js'; -import johnTravoltageStrings from '../../johnTravoltageStrings.js'; +import JohnTravoltageStrings from '../../JohnTravoltageStrings.js'; import ElectronNode from './ElectronNode.js'; -const electronsTotalDescriptionPatternString = johnTravoltageStrings.a11y.electrons.totalDescriptionPattern; -const electronsTotalAfterDischargePatternString = johnTravoltageStrings.a11y.electrons.totalAfterDischargePattern; +const electronsTotalDescriptionPatternString = JohnTravoltageStrings.a11y.electrons.totalDescriptionPattern; +const electronsTotalAfterDischargePatternString = JohnTravoltageStrings.a11y.electrons.totalAfterDischargePattern; const QUALITATIVE_DESCRIPTION_MAP = new Map(); QUALITATIVE_DESCRIPTION_MAP.set( new Range( 0, 0 ), 'No' ); diff --git a/js/john-travoltage/view/JohnTravoltageKeyboardHelpContent.js b/js/john-travoltage/view/JohnTravoltageKeyboardHelpContent.js index a0110bc..d2b489f 100644 --- a/js/john-travoltage/view/JohnTravoltageKeyboardHelpContent.js +++ b/js/john-travoltage/view/JohnTravoltageKeyboardHelpContent.js @@ -12,14 +12,14 @@ import KeyboardHelpSection from '../../../../scenery-phet/js/keyboard/help/Keybo import KeyboardHelpSectionRow from '../../../../scenery-phet/js/keyboard/help/KeyboardHelpSectionRow.js'; import TwoColumnKeyboardHelpContent from '../../../../scenery-phet/js/keyboard/help/TwoColumnKeyboardHelpContent.js'; import johnTravoltage from '../../johnTravoltage.js'; -import johnTravoltageStrings from '../../johnTravoltageStrings.js'; +import JohnTravoltageStrings from '../../JohnTravoltageStrings.js'; -const handOrFootString = johnTravoltageStrings.handOrFoot; -const moveFootString = johnTravoltageStrings.moveFoot; -const moveHandString = johnTravoltageStrings.moveHand; +const handOrFootString = JohnTravoltageStrings.handOrFoot; +const moveFootString = JohnTravoltageStrings.moveFoot; +const moveHandString = JohnTravoltageStrings.moveHand; -const moveFootDescriptionString = johnTravoltageStrings.a11y.keyboardHelpDialog.moveFootDescription; -const moveHandDescriptionString = johnTravoltageStrings.a11y.keyboardHelpDialog.moveHandDescription; +const moveFootDescriptionString = JohnTravoltageStrings.a11y.keyboardHelpDialog.moveFootDescription; +const moveHandDescriptionString = JohnTravoltageStrings.a11y.keyboardHelpDialog.moveHandDescription; class JohnTravoltageKeyboardHelpContent extends TwoColumnKeyboardHelpContent { constructor() { diff --git a/js/john-travoltage/view/JohnTravoltageView.js b/js/john-travoltage/view/JohnTravoltageView.js index 1a62f71..fa54ad3 100644 --- a/js/john-travoltage/view/JohnTravoltageView.js +++ b/js/john-travoltage/view/JohnTravoltageView.js @@ -18,7 +18,7 @@ import { Shape } from '../../../../kite/js/imports.js'; import platform from '../../../../phet-core/js/platform.js'; import StringUtils from '../../../../phetcommon/js/util/StringUtils.js'; import ResetAllButton from '../../../../scenery-phet/js/buttons/ResetAllButton.js'; -import sceneryPhetStrings from '../../../../scenery-phet/js/sceneryPhetStrings.js'; +import SceneryPhetStrings from '../../../../scenery-phet/js/SceneryPhetStrings.js'; import { Circle, Line, Node, Path, PDOMPeer } from '../../../../scenery/js/imports.js'; import PitchedPopGenerator from '../../../../tambo/js/sound-generators/PitchedPopGenerator.js'; import SoundClip from '../../../../tambo/js/sound-generators/SoundClip.js'; @@ -31,7 +31,7 @@ import electricDischarge_mp3 from '../../../sounds/electricDischarge_mp3.js'; import gazouch_mp3 from '../../../sounds/gazouch_mp3.js'; import ouch_mp3 from '../../../sounds/ouch_mp3.js'; import johnTravoltage from '../../johnTravoltage.js'; -import johnTravoltageStrings from '../../johnTravoltageStrings.js'; +import JohnTravoltageStrings from '../../JohnTravoltageStrings.js'; import AppendageRangeMaps from '../AppendageRangeMaps.js'; import JohnTravoltageQueryParameters from '../JohnTravoltageQueryParameters.js'; import JohnTravoltageModel from '../model/JohnTravoltageModel.js'; @@ -46,18 +46,18 @@ import LegNode from './LegNode.js'; import SparkNode from './SparkNode.js'; import vibrationController from './vibrationController.js'; -const screenSummaryBodyDescriptionPatternString = johnTravoltageStrings.a11y.screenSummary.bodyDescriptionPattern; -const electronsSingleDescriptionString = johnTravoltageStrings.a11y.electrons.singleDescription; -const electronsMultipleDescriptionPatternString = johnTravoltageStrings.a11y.electrons.multipleDescriptionPattern; -const descriptionWithChargePatternString = johnTravoltageStrings.a11y.screenSummary.descriptionWithChargePattern; -const voicingContentHintString = johnTravoltageStrings.a11y.voicing.contentHint; -const voicingDetailedContentHintString = johnTravoltageStrings.a11y.voicing.detailedContentHint; -const previousDischargePatternString = johnTravoltageStrings.a11y.voicing.previousDischargePattern; -const screenSummaryWithPreviousDischargePatternString = johnTravoltageStrings.a11y.voicing.screenSummaryWithPreviousDischargePattern; -const screenSummarySingleScreenIntroPatternString = sceneryPhetStrings.a11y.voicing.simSection.screenSummary.singleScreenIntroPattern; -const overviewPatternString = johnTravoltageStrings.a11y.voicing.overviewPattern; -const voicingChargedContentHintString = johnTravoltageStrings.a11y.voicing.chargedContentHint; -const multipleElectronsOnBodyPatternString = johnTravoltageStrings.a11y.voicing.multipleElectronsOnBodyPattern; +const screenSummaryBodyDescriptionPatternString = JohnTravoltageStrings.a11y.screenSummary.bodyDescriptionPattern; +const electronsSingleDescriptionString = JohnTravoltageStrings.a11y.electrons.singleDescription; +const electronsMultipleDescriptionPatternString = JohnTravoltageStrings.a11y.electrons.multipleDescriptionPattern; +const descriptionWithChargePatternString = JohnTravoltageStrings.a11y.screenSummary.descriptionWithChargePattern; +const voicingContentHintString = JohnTravoltageStrings.a11y.voicing.contentHint; +const voicingDetailedContentHintString = JohnTravoltageStrings.a11y.voicing.detailedContentHint; +const previousDischargePatternString = JohnTravoltageStrings.a11y.voicing.previousDischargePattern; +const screenSummaryWithPreviousDischargePatternString = JohnTravoltageStrings.a11y.voicing.screenSummaryWithPreviousDischargePattern; +const screenSummarySingleScreenIntroPatternString = SceneryPhetStrings.a11y.voicing.simSection.screenSummary.singleScreenIntroPattern; +const overviewPatternString = JohnTravoltageStrings.a11y.voicing.overviewPattern; +const voicingChargedContentHintString = JohnTravoltageStrings.a11y.voicing.chargedContentHint; +const multipleElectronsOnBodyPatternString = JohnTravoltageStrings.a11y.voicing.multipleElectronsOnBodyPattern; // constants const OUCH_EXCLAMATION_DELAY = 0.5; // in seconds diff --git a/js/john-travoltage/view/LegNode.js b/js/john-travoltage/view/LegNode.js index 2ba1474..e4f4912 100644 --- a/js/john-travoltage/view/LegNode.js +++ b/js/john-travoltage/view/LegNode.js @@ -9,15 +9,15 @@ import merge from '../../../../phet-core/js/merge.js'; import Utterance from '../../../../utterance-queue/js/Utterance.js'; import leg_png from '../../../images/leg_png.js'; import johnTravoltage from '../../johnTravoltage.js'; -import johnTravoltageStrings from '../../johnTravoltageStrings.js'; +import JohnTravoltageStrings from '../../JohnTravoltageStrings.js'; import AppendageRangeMaps from '../AppendageRangeMaps.js'; import JohnTravoltageModel from '../model/JohnTravoltageModel.js'; import AppendageNode from './AppendageNode.js'; // constants -const appendageLegLabelString = johnTravoltageStrings.a11y.appendages.leg.label; -const footInteractionHintString = johnTravoltageStrings.a11y.voicing.footInteractionHint; -const johnFullyChargedString = johnTravoltageStrings.a11y.voicing.johnFullyCharged; +const appendageLegLabelString = JohnTravoltageStrings.a11y.appendages.leg.label; +const footInteractionHintString = JohnTravoltageStrings.a11y.voicing.footInteractionHint; +const johnFullyChargedString = JohnTravoltageStrings.a11y.voicing.johnFullyCharged; const ALERTS_FOR_MAX_CHARGE = 2;