Ticket #40492: 40492.diff

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

@@ -8 +8 @@
 ( function( $ ) {
         var $body, $window, $sidebar, adminbarOffset, top = false,
             bottom = false, windowWidth, windowHeight, lastWindowPos = 0,
-            topOffset = 0, bodyHeight, sidebarHeight, resizeTimer,
+            topOffset = 0, pageHeight, sidebarHeight, resizeTimer,
             secondary, button;
 
         function initMainNavigation( container ) {
@@ -113 +113 @@
 
                 sidebarHeight = $sidebar.height();
                 windowHeight  = $window.height();
-                bodyHeight    = $body.height();
+                pageHeight    = $('#page').height();
 
                 if ( sidebarHeight + adminbarOffset > windowHeight ) {
                         if ( windowPos > lastWindowPos ) {
@@ -121 +121 @@
                                         top = false;
                                         topOffset = ( $sidebar.offset().top > 0 ) ? $sidebar.offset().top - adminbarOffset : 0;
                                         $sidebar.attr( 'style', 'top: ' + topOffset + 'px;' );
-                                } else if ( ! bottom && windowPos + windowHeight > sidebarHeight + $sidebar.offset().top && sidebarHeight + adminbarOffset < bodyHeight ) {
+                                } else if ( ! bottom && windowPos + windowHeight > sidebarHeight + $sidebar.offset().top && sidebarHeight + adminbarOffset < pageHeight ) {
                                         bottom = true;
                                         $sidebar.attr( 'style', 'position: fixed; bottom: 0;' );
                                 }