use nested options for HelpContent, see phetsims/scenery-phet#364

phetsims · Apr 10, 2018 · 15a58c1 · 15a58c1
1 parent f559085
commit 15a58c1
Showing 1 changed file with 16 additions and 13 deletions.
diff --git a/js/balloons-and-static-electricity/view/BASEKeyboardHelpContent.js b/js/balloons-and-static-electricity/view/BASEKeyboardHelpContent.js
@@ -96,8 +96,9 @@ define( function( require ) {
     var enterKeyNode = new EnterKeyNode();
     var icons = HelpContent.iconOrIcon( spaceKeyNode, enterKeyNode );
     var labelWithContent = HelpContent.labelWithIcon( label, icons, {
-      a11yIconLabelContent: grabOrReleaseBalloonDescriptionString,
-      a11yIconTagName: 'p'
+      iconOptions: {
+        innerContent: grabOrReleaseBalloonDescriptionString
+      }
     } );
 
     HelpContent.call( this, grabOrReleaseBalloonHeadingString, [ labelWithContent ], {
@@ -127,24 +128,24 @@ define( function( require ) {
 
     var arrowOrWasdKeysIcon = HelpContent.arrowOrWasdKeysRowIcon();
     var labelWithContent = HelpContent.labelWithIcon( moveGrabbedBalloonLabel, arrowOrWasdKeysIcon, {
-
-      // a11y
-      a11yIconLabelContent: moveGrabbedBalloonDescriptionString
+      iconOptions: {
+        innerContent: moveGrabbedBalloonDescriptionString
+      }
     } );
 
     var arrowKeysIcon = HelpContent.arrowKeysRowIcon();
     var shiftAndArrowKeysIcon = HelpContent.shiftPlusIcon( arrowKeysIcon );
     var wasdRowIcon = HelpContent.wasdRowIcon();
     var shiftAndWasdRowIcon = HelpContent.shiftPlusIcon( wasdRowIcon );
     var labelWithIconList = HelpContent.labelWithIconList( moveSlowerLabel, [ shiftAndArrowKeysIcon, shiftAndWasdRowIcon ], {
-      a11yIconLabelContent: moveSlowerDescriptionString
+      innerContent: moveSlowerDescriptionString
     } );
 
     // hot key content for how to jump the balloon
-    var jumpToSweaterRow = createJumpKeyRow( 'S', jumpsCloseToSweaterString, { a11yIconLabelContent: jumpsCloseToSweaterDescriptionString } );
-    var jumpToWallRow = createJumpKeyRow( 'W', jumpsCloseToWallString, { a11yIconLabelContent: jumpsCloseToWwallDescriptionString } );
-    var jumpNearWallRow = createJumpKeyRow( 'N', jumpsNearWallString, { a11yIconLabelContent: jumpsNearWallDescriptionString } );
-    var jumpToCenterRow = createJumpKeyRow( 'C', jumpsToCenterString, { a11yIconLabelContent: jumpstoCenterDescriptionString } );
+    var jumpToSweaterRow = createJumpKeyRow( 'S', jumpsCloseToSweaterString, { innerContent: jumpsCloseToSweaterDescriptionString } );
+    var jumpToWallRow = createJumpKeyRow( 'W', jumpsCloseToWallString, { innerContent: jumpsCloseToWwallDescriptionString } );
+    var jumpNearWallRow = createJumpKeyRow( 'N', jumpsNearWallString, { innerContent: jumpsNearWallDescriptionString } );
+    var jumpToCenterRow = createJumpKeyRow( 'C', jumpsToCenterString, { innerContent: jumpstoCenterDescriptionString } );
 
     // all content contained in a left aligned vbox
     var content = [ labelWithContent, labelWithIconList, jumpToSweaterRow, jumpToWallRow, jumpNearWallRow, jumpToCenterRow ];
@@ -161,13 +162,13 @@ define( function( require ) {
    *
    * @param {string} keyString - the letter name that will come after 'j'
    * @param {string} labelString
-   * @param {Object} options
+   * @param {Object} options - options passed to HelpContent
    * @return {HBox}
    */
   function createJumpKeyRow( keyString, labelString, options ) {
 
     options = _.extend( {
-      a11yIconLabelContent: null
+      innerContent: null
     }, options );
 
     var label = new Text( labelString, {
@@ -179,7 +180,9 @@ define( function( require ) {
     var otherKey = new TextKeyNode( keyString );
 
     var jPlusOtherKey = HelpContent.iconPlusIcon( jKey, otherKey );
-    return HelpContent.labelWithIcon( label, jPlusOtherKey, options );
+    return HelpContent.labelWithIcon( label, jPlusOtherKey, {
+      iconOptions: options
+    } );
   }
 
   return BASEKeyboardHelpContent;