Changeset 31934

Timestamp:

03/30/2015 10:48:11 PM (10 years ago)

Author:

lancewillett

Message:

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

Fixes #31734. Props jartes, lancewillett.

Location:

trunk/src/wp-content/themes/twentyfifteen

Files:

• functions.php (modified) (1 diff)
• js/functions.js (modified) (2 diffs)

trunk/src/wp-content/themes/twentyfifteen/functions.php

@@ -251 +251 @@
     }
 
-    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>',

trunk/src/wp-content/themes/twentyfifteen/js/functions.js

@@ -81 +81 @@
     // Sidebar scrolling.
     function resize() {
-        windowWidth   = $window.width();
-        windowHeight  = $window.height();
-        bodyHeight    = $body.height();
-        sidebarHeight = $sidebar.height();
+        windowWidth = $window.width();
 
         if ( 955 > windowWidth ) {
@@ -98 +95 @@
             return;
         }
+
+        sidebarHeight = $sidebar.height();
+        windowHeight  = $window.height();
+        bodyHeight    = $body.height();
 
         if ( sidebarHeight + adminbarOffset > windowHeight ) {