Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-06-28 07:45:02 +02:00
Code Issues Projects Releases Wiki Activity

Customize: Fix jumping behavior upon scrolling up when a sticky header has its description expanded.

Browse Source 
Props delawski.
See #34343, #41879.
Fixes #41850.

Built from https://develop.svn.wordpress.org/trunk@41679


git-svn-id: http://core.svn.wordpress.org/trunk@41513 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Weston Ruter 2017-10-02 18:55:47 +00:00
parent 5087d26d2d
commit d8d8a01134
3 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
wp-admin/js/customize-controls.js
View File

@ -1315,7 +1315,9 @@
}
content = meta.find( '.customize-section-description:first' );
content.toggleClass( 'open' );
content.slideToggle();
content.slideToggle( section.defaultExpandedArguments.duration, function() {
content.trigger( 'toggled' );
} );
$( this ).attr( 'aria-expanded', function( i, attr ) {
return 'true' === attr ? 'false' : 'true';
});
@ -2558,10 +2560,14 @@
var content = meta.find( '.customize-panel-description:first' );
if ( meta.hasClass( 'open' ) ) {
meta.toggleClass( 'open' );
content.slideUp( panel.defaultExpandedArguments.duration );
content.slideUp( panel.defaultExpandedArguments.duration, function() {
content.trigger( 'toggled' );
} );
$( this ).attr( 'aria-expanded', false );
} else {
content.slideDown( panel.defaultExpandedArguments.duration );
content.slideDown( panel.defaultExpandedArguments.duration, function() {
content.trigger( 'toggled' );
} );
meta.toggleClass( 'open' );
$( this ).attr( 'aria-expanded', true );
}
@ -6411,10 +6417,14 @@
if ( section.hasClass( 'open' ) ) {
section.toggleClass( 'open' );
content.slideUp( api.Panel.prototype.defaultExpandedArguments.duration );
content.slideUp( api.Panel.prototype.defaultExpandedArguments.duration, function() {
content.trigger( 'toggled' );
} );
$( this ).attr( 'aria-expanded', false );
} else {
content.slideDown( api.Panel.prototype.defaultExpandedArguments.duration );
content.slideDown( api.Panel.prototype.defaultExpandedArguments.duration, function() {
content.trigger( 'toggled' );
} );
section.toggleClass( 'open' );
$( this ).attr( 'aria-expanded', true );
}
@ -7365,7 +7375,7 @@
*/
(function initStickyHeaders() {
var parentContainer = $( '.wp-full-overlay-sidebar-content' ),
changeContainer, getHeaderHeight, releaseStickyHeader, resetStickyHeader, positionStickyHeader,
changeContainer, updateHeaderHeight, releaseStickyHeader, resetStickyHeader, positionStickyHeader,
activeHeader, lastScrollTop;
/**
@ -7383,9 +7393,12 @@
expandedPanel = api.state( 'expandedPanel' ).get(),
headerElement;
// Release previously active header element.
if ( activeHeader && activeHeader.element ) {
// Release previously active header element.
releaseStickyHeader( activeHeader.element );
// Remove event listener in the previous panel or section.
activeHeader.element.find( '.description' ).off( 'toggled', updateHeaderHeight );
}
if ( ! newInstance ) {
@ -7405,8 +7418,12 @@
instance: newInstance,
element: headerElement,
parent: headerElement.closest( '.customize-pane-child' ),
height: getHeaderHeight( headerElement )
height: headerElement.outerHeight()
};
// Update header height whenever help text is expanded or collapsed.
activeHeader.element.find( '.description' ).on( 'toggled', updateHeaderHeight );
if ( expandedSection ) {
resetStickyHeader( activeHeader.element, activeHeader.parent );
}
@ -7475,21 +7492,15 @@
};
/**
* Get header height.
* Update active header height.
*
* @since 4.7.0
* @access private
*
* @param {jQuery} headerElement Header element.
* @returns {number} Height.
* @returns {void}
*/
getHeaderHeight = function( headerElement ) {
var height = headerElement.data( 'height' );
if ( ! height ) {
height = headerElement.outerHeight();
headerElement.data( 'height', height );
}
return height;
updateHeaderHeight = function() {
activeHeader.height = activeHeader.element.outerHeight();
};
/**
@ -7945,7 +7956,8 @@
if ( control && ! control.setting.get() ) {
section.container.find( '.section-meta .customize-section-description:first' )
.addClass( 'open' )
.show();
.show()
.trigger( 'toggled' );
section.container.find( '.customize-help-toggle' ).attr( 'aria-expanded', 'true' );
}

8
wp-admin/js/customize-controls.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.9-alpha-41678';
$wp_version = '4.9-alpha-41679';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.