Changeset 33942

Timestamp:

09/07/2015 06:19:35 AM (8 years ago)

Author:

westonruter

Message:

Customizer: Collapse any expanded panel/sections before expanding other panel/sections.

Fix removes need for workaround introduced in [33488] for direct link from nav menu widget to the customizer widgets panel. The todo is now implemented.

Cherry-picks [33837] onto 4.3 branch.
Props celloexpressions, westonruter.
Fixes #33396 for 4.3.

Location:

branches/4.3/src

Files:

• wp-admin/js/customize-controls.js (modified) (2 diffs)
• wp-includes/default-widgets.php (modified) (1 diff)

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

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

branches/4.3/src/wp-includes/default-widgets.php

@@ -1575 +1575 @@
             <?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' );