From 1ee367d168ae92d088e0506f95f6acfadb9f2d8d Mon Sep 17 00:00:00 2001 From: Jesse Date: Wed, 23 Jan 2019 14:31:26 -0500 Subject: [PATCH] a11y instrumentation in RoundButtonView, removed from subtypes, see #459 --- js/buttons/RoundButtonView.js | 5 ++++- js/buttons/RoundPushButton.js | 5 +---- js/buttons/RoundStickyToggleButton.js | 5 +---- js/buttons/RoundToggleButton.js | 5 +---- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/js/buttons/RoundButtonView.js b/js/buttons/RoundButtonView.js index df1a78f0..c2d14f0c 100644 --- a/js/buttons/RoundButtonView.js +++ b/js/buttons/RoundButtonView.js @@ -72,7 +72,10 @@ define( function( require ) { // on the button's state. This can be a stock strategy from this file, // or custom. To create a custom one, model it off of the stock // version(s) defined in this file. - contentAppearanceStrategy: RoundButtonView.FadeContentWhenDisabled + contentAppearanceStrategy: RoundButtonView.FadeContentWhenDisabled, + + // a11y + tagName: 'button' }, options ); Node.call( this ); diff --git a/js/buttons/RoundPushButton.js b/js/buttons/RoundPushButton.js index afd30a2b..6ab9da6e 100644 --- a/js/buttons/RoundPushButton.js +++ b/js/buttons/RoundPushButton.js @@ -29,10 +29,7 @@ define( function( require ) { function RoundPushButton( options ) { options = _.extend( { - tandem: Tandem.required, - - // a11y - tagName: 'button' + tandem: Tandem.required }, options ); var self = this; diff --git a/js/buttons/RoundStickyToggleButton.js b/js/buttons/RoundStickyToggleButton.js index 610b5175..6e7cd35e 100644 --- a/js/buttons/RoundStickyToggleButton.js +++ b/js/buttons/RoundStickyToggleButton.js @@ -31,10 +31,7 @@ define( function( require ) { options = _.extend( { tandem: Tandem.required, - phetioType: ToggleButtonIO, - - // a11y - tagName: 'button' + phetioType: ToggleButtonIO }, options ); // @private (read-only) diff --git a/js/buttons/RoundToggleButton.js b/js/buttons/RoundToggleButton.js index 4ac358f1..94e7dab7 100644 --- a/js/buttons/RoundToggleButton.js +++ b/js/buttons/RoundToggleButton.js @@ -30,10 +30,7 @@ define( function( require ) { // Tandem support options = _.extend( { tandem: Tandem.required, - phetioType: ToggleButtonIO, - - // a11y - tagName: 'button' + phetioType: ToggleButtonIO }, options ); // @private (read-only)