vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2025-10-16 12:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Twenty Fifteen: adjust scroll behavior to make sure sidebar height is calculated during scroll events, not just resize events.

Browse Source 
Fixes #31734. Props jartes, lancewillett.

git-svn-id: https://develop.svn.wordpress.org/trunk@31934 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Lance Willett 2015-03-30 22:48:11 +00:00
parent c0104d6cc2
commit 2d3a51d16c
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wp-content/themes/twentyfifteen/functions.php
View File

@ -250,7 +250,7 @@ function twentyfifteen_scripts() {
wp_enqueue_script( 'twentyfifteen-keyboard-image-navigation', get_template_directory_uri() . '/js/keyboard-image-navigation.js', array( 'jquery' ), '20141010' );
}
wp_enqueue_script( 'twentyfifteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20141212', true );
wp_enqueue_script( 'twentyfifteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20150330', true );
wp_localize_script( 'twentyfifteen-script', 'screenReaderText', array(
'expand' => '<span class="screen-reader-text">' . __( 'expand child menu', 'twentyfifteen' ) . '</span>',
'collapse' => '<span class="screen-reader-text">' . __( 'collapse child menu', 'twentyfifteen' ) . '</span>',

9
src/wp-content/themes/twentyfifteen/js/functions.js
View File

@ -80,10 +80,7 @@
// Sidebar scrolling.
function resize() {
windowWidth = $window.width();
windowHeight = $window.height();
bodyHeight = $body.height();
sidebarHeight = $sidebar.height();
windowWidth = $window.width();
if ( 955 > windowWidth ) {
top = bottom = false;
@ -98,6 +95,10 @@
return;
}
sidebarHeight = $sidebar.height();
windowHeight = $window.height();
bodyHeight = $body.height();
if ( sidebarHeight + adminbarOffset > windowHeight ) {
if ( windowPos > lastWindowPos ) {
if ( top ) {