Ticket #33396: 33396.2.diff

src/wp-admin/js/customize-controls.js

@@ -648 +648 @@
                                                 completeCallback: expand
                                         });
                                 } else {
+                                        api.panel.each( function( panel ) {
+                                                panel.collapse();
+                                        });
                                         expand();
                                 }
 
@@ -1257 +1260 @@
 
                                 // Collapse any sibling sections/panels
                                 api.section.each( function ( section ) {
-                                        if ( ! section.panel() ) {
+                                        if ( panel.id !== section.panel() ) {
                                                 section.collapse( { duration: 0 } );
                                         }
                                 });

src/wp-includes/default-widgets.php

@@ -1574 +1574 @@
                 <p class="nav-menu-widget-no-menus-message" <?php if ( ! empty( $menus ) ) { echo ' style="display:none" '; } ?>>
                         <?php
                         if ( isset( $GLOBALS['wp_customize'] ) && $GLOBALS['wp_customize'] instanceof WP_Customize_Manager ) {
-                                // @todo When expanding a panel, the JS should be smart enough to collapse any existing panels and sections.
-                                $url = 'javascript: wp.customize.section.each(function( section ){ section.collapse(); }); wp.customize.panel( "nav_menus" ).focus();';
+                                $url = 'javascript: wp.customize.panel( "nav_menus" ).focus();';
                         } else {
                                 $url = admin_url( 'nav-menus.php' );
                         }