sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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.


git-svn-id: https://develop.svn.wordpress.org/trunk@33837 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Weston Ruter 2015-08-31 23:07:57 +00:00
parent 43d053318e
commit 57a7ed15a7
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/wp-admin/js/customize-controls.js
View File

@ -655,6 +655,9 @@
completeCallback: expand
});
} else {
api.panel.each( function( panel ) {
panel.collapse();
});
expand();
}
@ -1264,7 +1267,7 @@
// Collapse any sibling sections/panels
api.section.each( function ( section ) {
if ( ! section.panel() ) {
if ( panel.id !== section.panel() ) {
section.collapse( { duration: 0 } );
}
});

3
src/wp-includes/default-widgets.php
View File

@ -1570,8 +1570,7 @@ class WP_Widget_Tag_Cloud extends WP_Widget {
<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' );
}