converted aria-labelled/describedby usages to new api, phetsims/scene…

…ry#701
phetsims · Jun 22, 2018 · 4c870eb · 4c870eb
1 parent 1e1dca6
commit 4c870eb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/js/AboutDialog.js b/js/AboutDialog.js
@@ -9,6 +9,7 @@ define( function( require ) {
   'use strict';
 
   // modules
+  var AccessiblePeer = require( 'SCENERY/accessibility/AccessiblePeer' );
   var ButtonListener = require( 'SCENERY/input/ButtonListener' );
   var CreditsNode = require( 'JOIST/CreditsNode' );
   var Dialog = require( 'SUN/Dialog' );
@@ -210,7 +211,11 @@ define( function( require ) {
     } );
 
     // a11y - set label association so the title is read when focus enters the dialog
-    this.setAriaLabelledByNode( titleText );
+    this.addAriaLabelledbyAssociation( {
+      thisElementName: AccessiblePeer.PRIMARY_SIBLING,
+      otherNode: titleText,
+      otherElementName: AccessiblePeer.PRIMARY_SIBLING
+    } );
 
     // close it on a click
     var closeListener = new ButtonListener( {

diff --git a/js/NavigationBar.js b/js/NavigationBar.js
@@ -142,9 +142,12 @@ define( function( require ) {
       keyboardHelpButtonLayoutWidth = this.keyboardHelpButton.width + KEYBOARD_HELP_BUTTON_LEFT_MARGIN;
     }
 
-    // a11y - tell this node that it is ariaLabelledBy its own labelContent.
-    this.ariaLabelledByNode = this;
-    this.ariaLabelContent = AccessiblePeer.LABEL_SIBLING;
+    // a11y - tell this node that it is aria-labelledby its own labelContent.
+    this.addAriaLabelledbyAssociation( {
+      thisElementName: AccessiblePeer.PRIMARY_SIBLING,
+      otherNode: this,
+      otherElementName: AccessiblePeer.LABEL_SIBLING
+    });
 
     if ( screens.length === 1 ) {
       /* single-screen sim */