<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[40395] trunk/src: Customize: Auto-expand a widget area section when expanding the Widgets panel if there is only one registered sidebar and it is active.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/40395">40395</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/40395","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>westonruter</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-04-07 19:26:31 +0000 (Fri, 07 Apr 2017)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Customize: Auto-expand a widget area section when expanding the Widgets panel if there is only one registered sidebar and it is active.
Introduces `WP_Customize_Panel::$auto_expand_sole_section` property which allows panels to opt-in to the behavior, which the Widgets panel is made to do by default.
Props delawski, westonruter, melchoyce.
Fixes <a href="https://core.trac.wordpress.org/ticket/37471">#37471</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsscustomizecontrolscss">trunk/src/wp-admin/css/customize-controls.css</a></li>
<li><a href="#trunksrcwpadminjscustomizecontrolsjs">trunk/src/wp-admin/js/customize-controls.js</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizepanelphp">trunk/src/wp-includes/class-wp-customize-panel.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizewidgetsphp">trunk/src/wp-includes/class-wp-customize-widgets.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincsscustomizecontrolscss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/customize-controls.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/customize-controls.css 2017-04-07 14:35:39 UTC (rev 40394)
+++ trunk/src/wp-admin/css/customize-controls.css 2017-04-07 19:26:31 UTC (rev 40395)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -303,6 +303,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> transition: 0.18s transform cubic-bezier(0.645, 0.045, 0.355, 1), 0.18s -webkit-transform cubic-bezier(0.645, 0.045, 0.355, 1); /* easeInOutCubic */
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#customize-theme-controls .customize-pane-child.skip-transition {
+ -webkit-transition: none;
+ transition: none;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> #customize-info,
</span><span class="cx" style="display: block; padding: 0 10px"> #customize-theme-controls .customize-pane-parent {
</span><span class="cx" style="display: block; padding: 0 10px"> position: relative;
</span></span></pre></div>
<a id="trunksrcwpadminjscustomizecontrolsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/customize-controls.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/customize-controls.js 2017-04-07 14:35:39 UTC (rev 40394)
+++ trunk/src/wp-admin/js/customize-controls.js 2017-04-07 19:26:31 UTC (rev 40395)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -711,11 +711,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var construct = this,
</span><span class="cx" style="display: block; padding: 0 10px"> content = construct.contentContainer,
</span><span class="cx" style="display: block; padding: 0 10px"> overlay = content.closest( '.wp-full-overlay' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- elements, transitionEndCallback;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ elements, transitionEndCallback, transitionParentPane;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Determine set of elements that are affected by the animation.
</span><span class="cx" style="display: block; padding: 0 10px"> elements = overlay.add( content );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( _.isUndefined( construct.panel ) || '' === construct.panel() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( ! construct.panel || '' === construct.panel() ) {
+ transitionParentPane = true;
+ } else if ( api.panel( construct.panel() ).contentContainer.hasClass( 'skip-transition' ) ) {
+ transitionParentPane = true;
+ } else {
+ transitionParentPane = false;
+ }
+ if ( transitionParentPane ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> elements = elements.add( '#customize-info, .customize-pane-parent' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -996,7 +1004,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> overlay = section.headContainer.closest( '.wp-full-overlay' ),
</span><span class="cx" style="display: block; padding: 0 10px"> backBtn = content.find( '.customize-section-back' ),
</span><span class="cx" style="display: block; padding: 0 10px"> sectionTitle = section.headContainer.find( '.accordion-section-title' ).first(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- expand;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ expand, panel;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( expanded && ! content.hasClass( 'open' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1044,6 +1052,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> } else if ( ! expanded && content.hasClass( 'open' ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( section.panel() ) {
+ panel = api.panel( section.panel() );
+ if ( panel.contentContainer.hasClass( 'skip-transition' ) ) {
+ panel.collapse();
+ }
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> section._animateChangeExpanded( function() {
</span><span class="cx" style="display: block; padding: 0 10px"> backBtn.attr( 'tabindex', '-1' );
</span><span class="cx" style="display: block; padding: 0 10px"> sectionTitle.attr( 'tabindex', '0' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1722,7 +1736,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> overlay = accordionSection.closest( '.wp-full-overlay' ),
</span><span class="cx" style="display: block; padding: 0 10px"> container = accordionSection.closest( '.wp-full-overlay-sidebar-content' ),
</span><span class="cx" style="display: block; padding: 0 10px"> topPanel = panel.headContainer.find( '.accordion-section-title' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- backBtn = accordionSection.find( '.customize-panel-back' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ backBtn = accordionSection.find( '.customize-panel-back' ),
+ childSections = panel.sections(),
+ skipTransition;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( expanded && ! accordionSection.hasClass( 'current-panel' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Collapse any sibling sections/panels
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1737,35 +1753,50 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- panel._animateChangeExpanded( function() {
- topPanel.attr( 'tabindex', '-1' );
- backBtn.attr( 'tabindex', '0' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( panel.params.autoExpandSoleSection && 1 === childSections.length && childSections[0].active.get() ) {
+ accordionSection.addClass( 'current-panel skip-transition' );
+ overlay.addClass( 'in-sub-panel' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- backBtn.focus();
- accordionSection.css( 'top', '' );
- container.scrollTop( 0 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ childSections[0].expand( {
+ completeCallback: args.completeCallback
+ } );
+ } else {
+ panel._animateChangeExpanded( function() {
+ topPanel.attr( 'tabindex', '-1' );
+ backBtn.attr( 'tabindex', '0' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( args.completeCallback ) {
- args.completeCallback();
- }
- } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ backBtn.focus();
+ accordionSection.css( 'top', '' );
+ container.scrollTop( 0 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- overlay.addClass( 'in-sub-panel' );
- accordionSection.addClass( 'current-panel' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( args.completeCallback ) {
+ args.completeCallback();
+ }
+ } );
+
+ accordionSection.addClass( 'current-panel' );
+ overlay.addClass( 'in-sub-panel' );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> api.state( 'expandedPanel' ).set( panel );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> } else if ( ! expanded && accordionSection.hasClass( 'current-panel' ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- panel._animateChangeExpanded( function() {
- topPanel.attr( 'tabindex', '0' );
- backBtn.attr( 'tabindex', '-1' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ skipTransition = accordionSection.hasClass( 'skip-transition' );
+ if ( ! skipTransition ) {
+ panel._animateChangeExpanded( function() {
+ topPanel.attr( 'tabindex', '0' );
+ backBtn.attr( 'tabindex', '-1' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- topPanel.focus();
- accordionSection.css( 'top', '' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ topPanel.focus();
+ accordionSection.css( 'top', '' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( args.completeCallback ) {
- args.completeCallback();
- }
- } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( args.completeCallback ) {
+ args.completeCallback();
+ }
+ } );
+ } else {
+ accordionSection.removeClass( 'skip-transition' );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> overlay.removeClass( 'in-sub-panel' );
</span><span class="cx" style="display: block; padding: 0 10px"> accordionSection.removeClass( 'current-panel' );
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizepanelphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-customize-panel.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-panel.php 2017-04-07 14:35:39 UTC (rev 40394)
+++ trunk/src/wp-includes/class-wp-customize-panel.php 2017-04-07 19:26:31 UTC (rev 40395)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -104,6 +104,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public $description = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Auto-expand a section in a panel when the panel is expanded when the panel only has the one section.
+ *
+ * @since 4.7.4
+ * @access public
+ * @var bool
+ */
+ public $auto_expand_sole_section = false;
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Customizer sections for this panel.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.0.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -219,6 +228,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $array['content'] = $this->get_content();
</span><span class="cx" style="display: block; padding: 0 10px"> $array['active'] = $this->active();
</span><span class="cx" style="display: block; padding: 0 10px"> $array['instanceNumber'] = $this->instance_number;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $array['autoExpandSoleSection'] = $this->auto_expand_sole_section;
</ins><span class="cx" style="display: block; padding: 0 10px"> return $array;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizewidgetsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-customize-widgets.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-widgets.php 2017-04-07 14:35:39 UTC (rev 40394)
+++ trunk/src/wp-includes/class-wp-customize-widgets.php 2017-04-07 19:26:31 UTC (rev 40395)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -422,6 +422,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'Widgets are independent sections of content that can be placed into widgetized areas provided by your theme (commonly called sidebars).' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'priority' => 110,
</span><span class="cx" style="display: block; padding: 0 10px"> 'active_callback' => array( $this, 'is_panel_active' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'auto_expand_sole_section' => true,
</ins><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $sidebars_widgets as $sidebar_id => $sidebar_widget_ids ) {
</span></span></pre>
</div>
</div>
</body>
</html>