Changeset 33837

Timestamp:

08/31/2015 11:07:57 PM (11 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.

Props celloexpressions, westonruter.
Fixes #33396 for trunk.

Location:

trunk/src

Files:

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

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

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

trunk/src/wp-includes/default-widgets.php

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