Changeset 46438

Timestamp:

10/08/2019 05:05:53 PM (10 months ago)

Author:

afercia

Message:

Accessibility: Media: Improve the logic to render the ARIA tabs markup after [46363].

Additionally checks for the "menu" and "router" state attributes to better determine when the ARIA tabs pattern markup is appropriate.

See #47149.

File:

• trunk/src/js/media/views/media-frame.js (modified) (2 diffs)

trunk/src/js/media/views/media-frame.js

@@ -104 +104 @@
         tabPanelEl.removeAttr( 'role aria-labelledby tabindex' );
 
-        if ( this.menuView && this.menuView.isVisible ) {
+        if ( this.state().get( 'menu' ) && this.menuView && this.menuView.isVisible ) {
             ariaLabelledby = 'menu-item-' + stateId;
 
@@ -130 +130 @@
         tabPanelEl.removeAttr( 'role aria-labelledby tabindex' );
 
-        // On the Embed view the router menu is hidden.
-        if ( 'embed' === this.content._mode ) {
-            return;
-        }
-
         // Set the tab panel attributes only if the tabs are visible.
-        if ( this.routerView && this.routerView.isVisible && this.content._mode ) {
+        if ( this.state().get( 'router' ) && this.routerView && this.routerView.isVisible && this.content._mode ) {
             ariaLabelledby = 'menu-item-' + this.content._mode;