Changeset 30808

Timestamp:

12/10/2014 11:01:03 PM (10 years ago)

Author:

iandstewart

Message:

Twenty Fifteen: correcting odd scrolling and jumping in IE and no-scroll with window resize.

Props iamtakashi, ocean90, fixes #30632, #30645.

File:

• trunk/src/wp-content/themes/twentyfifteen/js/functions.js (modified) (4 diffs)

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

@@ -7 +7 @@
 
 ( function( $ ) {
-    var $body, $window, $document, $sidebar, adminbarOffset, top = false,
-        bottom = false, windowWidth, windowHeight, lastWindowPos = 0,
-        topOffset = 0, documentHeight, sidebarHeight, resizeTimer;
+    var $body, $window, $sidebar, adminbarOffset, top = false,
+        bottom = false, windowWidth, windowHeight, lastWindowPos = 0,
+        topOffset = 0, bodyHeight, sidebarHeight, resizeTimer;
 
     // Add dropdown toggle that display child menu items.
@@ -53 +53 @@
     // Sidebar scrolling.
     function resize() {
-        windowWidth = $window.width();
-        windowHeight = $window.height();
-        documentHeight = $document.height();
+        windowWidth   = $window.width();
+        windowHeight  = $window.height();
+        bodyHeight    = $body.height();
         sidebarHeight = $sidebar.height();
 
@@ -67 +67 @@
         var windowPos = $window.scrollTop();
 
-        if ( 955 <= windowWidth && sidebarHeight + adminbarOffset < documentHeight ) {
+        if ( 955 <= windowWidth && sidebarHeight + adminbarOffset < bodyHeight ) {
             if ( sidebarHeight + adminbarOffset > windowHeight ) {
                 if ( windowPos > lastWindowPos ) {
@@ -107 +107 @@
 
     $( document ).ready( function() {
-        $body          = $( 'body' );
+        $body          = $( document.body );
         $window        = $( window );
-        $document      = $( document );
-        $sidebar        = $( '#sidebar' ).first();
+        $sidebar       = $( '#sidebar' ).first();
         adminbarOffset = $body.is( '.admin-bar' ) ? $( '#wpadminbar' ).height() : 0;