<!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>[41679] trunk/src/wp-admin/js/customize-controls.js: Customize: Fix jumping behavior upon scrolling up when a sticky header has its description expanded.</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/41679">41679</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/41679","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-02 18:54:22 +0000 (Mon, 02 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 jumping behavior upon scrolling up when a sticky header has its description expanded.
Props delawski.
See <a href="https://core.trac.wordpress.org/ticket/34343">#34343</a>, <a href="https://core.trac.wordpress.org/ticket/41879">#41879</a>.
Fixes <a href="https://core.trac.wordpress.org/ticket/41850">#41850</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-02 18:39:30 UTC (rev 41678)
+++ trunk/src/wp-admin/js/customize-controls.js 2017-10-02 18:54:22 UTC (rev 41679)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1315,7 +1315,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> content = meta.find( '.customize-section-description:first' );
</span><span class="cx" style="display: block; padding: 0 10px"> content.toggleClass( 'open' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- content.slideToggle();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ content.slideToggle( section.defaultExpandedArguments.duration, function() {
+ content.trigger( 'toggled' );
+ } );
</ins><span class="cx" style="display: block; padding: 0 10px"> $( this ).attr( 'aria-expanded', function( i, attr ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return 'true' === attr ? 'false' : 'true';
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2558,10 +2560,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var content = meta.find( '.customize-panel-description:first' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( meta.hasClass( 'open' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> meta.toggleClass( 'open' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- content.slideUp( panel.defaultExpandedArguments.duration );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ content.slideUp( panel.defaultExpandedArguments.duration, function() {
+ content.trigger( 'toggled' );
+ } );
</ins><span class="cx" style="display: block; padding: 0 10px"> $( this ).attr( 'aria-expanded', false );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- content.slideDown( panel.defaultExpandedArguments.duration );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ content.slideDown( panel.defaultExpandedArguments.duration, function() {
+ content.trigger( 'toggled' );
+ } );
</ins><span class="cx" style="display: block; padding: 0 10px"> meta.toggleClass( 'open' );
</span><span class="cx" style="display: block; padding: 0 10px"> $( this ).attr( 'aria-expanded', true );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -6411,10 +6417,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( section.hasClass( 'open' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> section.toggleClass( 'open' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- content.slideUp( api.Panel.prototype.defaultExpandedArguments.duration );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ content.slideUp( api.Panel.prototype.defaultExpandedArguments.duration, function() {
+ content.trigger( 'toggled' );
+ } );
</ins><span class="cx" style="display: block; padding: 0 10px"> $( this ).attr( 'aria-expanded', false );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- content.slideDown( api.Panel.prototype.defaultExpandedArguments.duration );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ content.slideDown( api.Panel.prototype.defaultExpandedArguments.duration, function() {
+ content.trigger( 'toggled' );
+ } );
</ins><span class="cx" style="display: block; padding: 0 10px"> section.toggleClass( 'open' );
</span><span class="cx" style="display: block; padding: 0 10px"> $( this ).attr( 'aria-expanded', true );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7365,7 +7375,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> (function initStickyHeaders() {
</span><span class="cx" style="display: block; padding: 0 10px"> var parentContainer = $( '.wp-full-overlay-sidebar-content' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- changeContainer, getHeaderHeight, releaseStickyHeader, resetStickyHeader, positionStickyHeader,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ changeContainer, updateHeaderHeight, releaseStickyHeader, resetStickyHeader, positionStickyHeader,
</ins><span class="cx" style="display: block; padding: 0 10px"> activeHeader, lastScrollTop;
</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">@@ -7383,9 +7393,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> expandedPanel = api.state( 'expandedPanel' ).get(),
</span><span class="cx" style="display: block; padding: 0 10px"> headerElement;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Release previously active header element.
</del><span class="cx" style="display: block; padding: 0 10px"> if ( activeHeader && activeHeader.element ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Release previously active header element.
</ins><span class="cx" style="display: block; padding: 0 10px"> releaseStickyHeader( activeHeader.element );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Remove event listener in the previous panel or section.
+ activeHeader.element.find( '.description' ).off( 'toggled', updateHeaderHeight );
</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"> if ( ! newInstance ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7405,8 +7418,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> instance: newInstance,
</span><span class="cx" style="display: block; padding: 0 10px"> element: headerElement,
</span><span class="cx" style="display: block; padding: 0 10px"> parent: headerElement.closest( '.customize-pane-child' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- height: getHeaderHeight( headerElement )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ height: headerElement.outerHeight()
</ins><span class="cx" style="display: block; padding: 0 10px"> };
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Update header height whenever help text is expanded or collapsed.
+ activeHeader.element.find( '.description' ).on( 'toggled', updateHeaderHeight );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( expandedSection ) {
</span><span class="cx" style="display: block; padding: 0 10px"> resetStickyHeader( activeHeader.element, activeHeader.parent );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7475,21 +7492,15 @@
</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">- * Get header height.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Update active header height.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param {jQuery} headerElement Header element.
- * @returns {number} Height.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @returns {void}
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- getHeaderHeight = function( headerElement ) {
- var height = headerElement.data( 'height' );
- if ( ! height ) {
- height = headerElement.outerHeight();
- headerElement.data( 'height', height );
- }
- return height;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ updateHeaderHeight = function() {
+ activeHeader.height = activeHeader.element.outerHeight();
</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"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7945,7 +7956,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( control && ! control.setting.get() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> section.container.find( '.section-meta .customize-section-description:first' )
</span><span class="cx" style="display: block; padding: 0 10px"> .addClass( 'open' )
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- .show();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ .show()
+ .trigger( 'toggled' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> section.container.find( '.customize-help-toggle' ).attr( 'aria-expanded', 'true' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>