WordPress 4.3

[autoinstalls/wordpress.git] / wp-admin / js / accordion.js

diff --git a/wp-admin/js/accordion.js b/wp-admin/js/accordion.js
index 1769d27da900198895f4438f485c489d5e16ffd0..af6281546fded9ff51f7a2fb9d9c3f03054dba4c 100644 (file)
--- a/wp-admin/js/accordion.js
+++ b/wp-admin/js/accordion.js
@@ -53,7 +53,10 @@
         */
        function accordionSwitch ( el ) {
                var section = el.closest( '.accordion-section' ),
-                       siblings = section.closest( '.accordion-container' ).find( '.open' ),
+                       sectionToggleControl = section.find( '[aria-expanded]' ).first(),
+                       container = section.closest( '.accordion-container' ),
+                       siblings = container.find( '.open' ),
+                       siblingsToggleControl = siblings.find( '[aria-expanded]' ).first(),
                        content = section.find( '.accordion-section-content' );
 
                // This section has no content and cannot be expanded.
@@ -61,15 +64,30 @@
                        return;
                }
 
+               // Add a class to the container to let us know something is happening inside.
+               // This helps in cases such as hiding a scrollbar while animations are executing.
+               container.addClass( 'opening' );
+
                if ( section.hasClass( 'open' ) ) {
                        section.toggleClass( 'open' );
                        content.toggle( true ).slideToggle( 150 );
                } else {
+                       siblingsToggleControl.attr( 'aria-expanded', 'false' );
                        siblings.removeClass( 'open' );
                        siblings.find( '.accordion-section-content' ).show().slideUp( 150 );
                        content.toggle( false ).slideToggle( 150 );
                        section.toggleClass( 'open' );
                }
+
+               // We have to wait for the animations to finish
+               setTimeout(function(){
+                   container.removeClass( 'opening' );
+               }, 150);
+
+               // If there's an element with an aria-expanded attribute, assume it's a toggle control and toggle the aria-expanded value.
+               if ( sectionToggleControl ) {
+                       sectionToggleControl.attr( 'aria-expanded', String( sectionToggleControl.attr( 'aria-expanded' ) === 'false' ) );
+               }
        }
 
 })(jQuery);