<!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>[42033] trunk/src/wp-admin/js/customize-controls.js: Customize: Fix deep-linking to sections for themes via `autofocus[section]` query parameter.</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/42033">42033</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/42033","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-10-28 05:21:42 +0000 (Sat, 28 Oct 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: Fix deep-linking to sections for themes via `autofocus[section]` query parameter.
* Expand containing panel when expanding themes section.
* Consolidate UI changes related to a section's expanded state change.
* Prevent collapsing current section when expanding.
* Auto-expand first themes section when expanding panel if one is not expanded already.
See <a href="https://core.trac.wordpress.org/ticket/37661">#37661</a>, <a href="https://core.trac.wordpress.org/ticket/42354">#42354</a>.
Fixes <a href="https://core.trac.wordpress.org/ticket/42360">#42360</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjscustomizecontrolsjs">trunk/src/wp-admin/js/customize-controls.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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-10-28 01:56:00 UTC (rev 42032)
+++ trunk/src/wp-admin/js/customize-controls.js 2017-10-28 05:21:42 UTC (rev 42033)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1887,6 +1887,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> api.section( 'wporg_themes' ).focus();
</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">+ function updateSelectedState() {
+ var el = section.headerContainer.find( '.customize-themes-section-title' );
+ el.toggleClass( 'selected', section.expanded() );
+ el.attr( 'aria-expanded', section.expanded() ? 'true' : 'false' );
+ if ( ! section.expanded() ) {
+ el.removeClass( 'details-open' );
+ }
+ }
+ section.expanded.bind( updateSelectedState );
+ updateSelectedState();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Move section controls to the themes area.
</span><span class="cx" style="display: block; padding: 0 10px"> api.bind( 'ready', function () {
</span><span class="cx" style="display: block; padding: 0 10px"> section.contentContainer = section.container.find( '.customize-themes-section' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1920,7 +1931,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</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">- if ( expanded ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function expand() {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Try to load controls if none are loaded yet.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 0 === section.loaded ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1949,14 +1960,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> section.filterSearch( searchTerm );
</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">+ otherSection.collapse( { duration: args.duration } );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- otherSection.collapse( { duration: args.duration } );
</del><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><span class="cx" style="display: block; padding: 0 10px"> section.contentContainer.addClass( 'current-section' );
</span><span class="cx" style="display: block; padding: 0 10px"> container.scrollTop();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- section.headerContainer.find( '.customize-themes-section-title' ).addClass( 'selected' ).attr( 'aria-expanded', 'true' );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> container.on( 'scroll', _.throttle( section.renderScreenshots, 300 ) );
</span><span class="cx" style="display: block; padding: 0 10px"> container.on( 'scroll', _.throttle( section.loadMore, 300 ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1965,11 +1975,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> args.completeCallback();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> section.updateCount(); // Show this section's count.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
+
+ if ( expanded ) {
+ if ( section.panel() && api.panel.has( section.panel() ) ) {
+ api.panel( section.panel() ).expand({
+ duration: args.duration,
+ completeCallback: expand
+ });
+ } else {
+ expand();
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> section.contentContainer.removeClass( 'current-section' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Always hide, even if they don't exist or are already hidden.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- section.headerContainer.find( '.customize-themes-section-title' ).removeClass( 'selected details-open' ).attr( 'aria-expanded', 'false' );
</del><span class="cx" style="display: block; padding: 0 10px"> section.headerContainer.find( '.filter-details' ).slideUp( 180 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> container.off( 'scroll' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3058,7 +3078,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @returns {void}
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> onChangeExpanded: function( expanded, args ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var panel = this, overlay;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var panel = this, overlay, sections, hasExpandedSection = false;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Expand/collapse the panel normally.
</span><span class="cx" style="display: block; padding: 0 10px"> api.Panel.prototype.onChangeExpanded.apply( this, [ expanded, args ] );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3082,9 +3102,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> overlay.addClass( 'themes-panel-expanded' );
</span><span class="cx" style="display: block; padding: 0 10px"> }, 200 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Automatically open the installed themes section (except on small screens).
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Automatically open the first section (except on small screens), if one isn't already expanded.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( 600 < window.innerWidth ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- api.section( 'installed_themes' ).expand();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sections = panel.sections();
+ _.each( sections, function( section ) {
+ if ( section.expanded() ) {
+ hasExpandedSection = true;
+ }
+ } );
+ if ( ! hasExpandedSection && sections.length > 0 ) {
+ sections[0].expand();
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> overlay
</span></span></pre>
</div>
</div>
</body>
</html>