Ticket #23449: 23449.17.diff

wp-admin/css/wp-admin.css

@@ -8997 +8997 @@
         cursor: pointer;
 }
 
+.js .open .accordion-section-title {
+        cursor: default;
+}
+
 .js .accordion-section-title:after {
         content: '';
         width: 0;

wp-admin/customize.php

@@ -46 +46 @@
 wp_user_settings();
 _wp_admin_html_begin();
 
-$body_class = 'wp-core-ui';
+$body_class = 'wp-core-ui js';
 
 if ( wp_is_mobile() ) :
         $body_class .= ' mobile';
@@ -90 +90 @@
                         $cannot_expand = ! ( $screenshot || $wp_customize->theme()->get('Description') );
                 ?>
 
-                <div class="wp-full-overlay-sidebar-content" tabindex="-1">
+                <div class="wp-full-overlay-sidebar-content accordion-container" tabindex="-1">
                         <div id="customize-info" class="accordion-section<?php if ( $cannot_expand ) echo ' cannot-expand'; ?>">
                                 <div class="accordion-section-title" aria-label="<?php esc_attr_e( 'Theme Customizer Options' ); ?>" tabindex="0">
                                         <span class="preview-notice"><?php
@@ -111 +111 @@
                                 <?php endif; ?>
                         </div>
 
-                        <div id="customize-theme-controls" class="accordion-container"><ul>
+                        <div id="customize-theme-controls"><ul>
                                 <?php
                                 foreach ( $wp_customize->sections() as $section )
                                         $section->maybe_render();

wp-admin/js/accordion.js

@@ -9 +9 @@
                         e.preventDefault(); // Keep this AFTER the key filter above
 
                         accordionSwitch( $( this ) );
-                        accordionCorners();
                 });
 
                 // Refresh selected accordion option when screen options are toggled
@@ -27 +26 @@
                 accordionOptions.removeClass( 'top bottom' );
                 accordionOptions.filter( ':visible' ).first().addClass( 'top' );
                 accordionOptions.filter( ':visible' ).last().addClass( 'bottom' ).find( sectionContent ).addClass('bottom');
-        };
+        }
 
         function accordionInit () {
                 accordionSwitch( accordionOptions.filter( ':visible' ).first() );
@@ -36 +35 @@
 
         function accordionSwitch ( el ) {
                 var section = el.closest( '.accordion-section' ),
-                    siblings = section.parent().find( '.open' ),
-                    content = section.find( sectionContent );
+                        siblings = $( '.accordion-container' ).find( '.open' ),
+                        content = section.find( sectionContent );
 
-                if ( section.hasClass( 'cannot-expand' ) )
+                if ( section.hasClass( 'cannot-expand' ) || section.hasClass( 'open' ) )
                         return;
 
                 siblings.removeClass( 'open' );
                 siblings.find( sectionContent ).show().slideUp( 150 );
                 content.toggle( section.hasClass( 'open' ) ).slideToggle( 150 );
                 section.toggleClass( 'open' );
+
+                accordionCorners();
         }
 
         // Show the first accordion option by default