Changeset 23965

Timestamp:

04/11/2013 04:11:46 PM (11 years ago)

Author:

lancewillett

Message:

Twenty Thirteen: adjust JavaScript handling for scrolling and finding viewport heigh/width to better support various IE versions. Also consolidate variables at the top of the file per best practices. Fixes #23841, props obenland.

File:

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

trunk/wp-content/themes/twentythirteen/js/functions.js

@@ -6 +6 @@
 
 ( function( $ ) {
-    var twentyThirteen = {
+    var html          = $( 'html' ),
+        body          = $( 'body' ),
+        navbar        = $( '#navbar' ),
+        _window       = $( window ),
+        navbarOffset  = -1,
+        toolbarOffset = body.is( '.admin-bar' ) ? 28 : 0,
+
+        twentyThirteen = {
         /**
          * Adds a top margin to the footer if the sidebar widget area is
@@ -17 +24 @@
                 margin    = $( '#tertiary .widget-area' ).height() - $( '#content' ).height() - secondary;
 
-            if ( margin > 0 && window.innerWidth > 999 )
+            if ( margin > 0 && _window.innerWidth() > 999 )
                 $( '#colophon' ).css( 'margin-top', margin + 'px' );
         },
@@ -37 +44 @@
             twentyThirteen.adjustFooter();
     } );
-    $( window ).on( 'hashchange', twentyThirteen.adjustAnchor );
+    _window.on( 'hashchange', twentyThirteen.adjustAnchor );
 
     /**
      * Displays the fixed navbar based on screen position.
      */
-    var html          = $( 'html' ),
-        body          = $( 'body' ),
-        navbar        = $( '#navbar' ),
-        navbarOffset  = -1,
-        toolbarOffset = body.is( '.admin-bar' ) ? 28 : 0;
-
-    $( window ).scroll( function() {
+    _window.scroll( function() {
+        var scrollOffset = ( typeof window.scrollY === 'undefined' ) ? document.documentElement.scrollTop : window.scrollY;
         if ( navbarOffset < 0 )
             navbarOffset = navbar.offset().top - toolbarOffset;
 
-        if ( window.scrollY >= navbarOffset && 644 < window.innerWidth )
+        if ( scrollOffset >= navbarOffset && _window.innerWidth() > 644 )
             html.addClass( 'navbar-fixed' );
         else
@@ -98 +100 @@
      * @link http://www.nczonline.net/blog/2013/01/15/fixing-skip-to-content-links/
      */
-    $( window ).on( 'hashchange', function() {
+    _window.on( 'hashchange', function() {
         var element = $( location.hash );