Changeset 24004

Timestamp:

04/16/2013 09:51:07 PM (11 years ago)

Author:

lancewillett

Message:

Twenty Thirteen: improvements to functions.js to add namespacing to events and simplify repeatable functions. See #23875.

File:

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

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

@@ -12 +12 @@
         navbarOffset  = -1,
         toolbarOffset = body.is( '.admin-bar' ) ? 28 : 0,
+        adjustFooter,
+        adjustAnchor;
 
-        twentyThirteen = {
-        /**
-         * Adds a top margin to the footer if the sidebar widget area is
-         * higher than the rest of the page, to help the footer always
-         * visually clear the sidebar.
-         */
-        adjustFooter : function() {
-            var sidebar   = $( '#secondary .widget-area' ),
-                secondary = ( 0 == sidebar.length ) ? -40 : sidebar.height(),
-                margin    = $( '#tertiary .widget-area' ).height() - $( '#content' ).height() - secondary;
+    /**
+     * Adds a top margin to the footer if the sidebar widget area is
+     * higher than the rest of the page, to help the footer always
+     * visually clear the sidebar.
+     */
+    adjustFooter = function() {
+        var sidebar   = $( '#secondary .widget-area' ),
+            secondary = ( 0 == sidebar.length ) ? -40 : sidebar.height(),
+            margin    = $( '#tertiary .widget-area' ).height() - $( '#content' ).height() - secondary;
 
-            if ( margin > 0 && _window.innerWidth() > 999 )
-                $( '#colophon' ).css( 'margin-top', margin + 'px' );
-        },
+        if ( margin > 0 && _window.innerWidth() > 999 )
+            $( '#colophon' ).css( 'margin-top', margin + 'px' );
+    };
 
-        /**
-         * Repositions the window on jump-to-anchor to account for navbar
-         * height.
-         */
-        adjustAnchor : function() {
-            if ( window.location.hash )
-                window.scrollBy( 0, -49 );
-        }
+    /**
+     * Repositions the window on jump-to-anchor to account for navbar
+     * height.
+     */
+    adjustAnchor = function() {
+        if ( window.location.hash )
+            window.scrollBy( 0, -49 );
     };
 
     $( function() {
-        twentyThirteen.adjustAnchor();
+        adjustAnchor();
 
         if ( body.is( '.sidebar' ) )
-            twentyThirteen.adjustFooter();
+            adjustFooter();
     } );
-    _window.on( 'hashchange', twentyThirteen.adjustAnchor );
+    _window.on( 'hashchange.twentythirteen', adjustAnchor );
 
     /**
      * Displays the fixed navbar based on screen position.
      */
-    _window.scroll( function() {
+    _window.on( 'scroll.twentythirteen', function() {
         var scrollOffset = ( typeof window.scrollY === 'undefined' ) ? document.documentElement.scrollTop : window.scrollY;
         if ( navbarOffset < 0 )
@@ -63 +63 @@
      * Allows clicking the navbar to scroll to top.
      */
-    navbar.on( 'click', function( event ) {
+    navbar.on( 'click.twentythirteen', function( event ) {
         // Ensure that the navbar element was the target of the click.
         if ( 'navbar' == event.target.id  || 'site-navigation' == event.target.id )
@@ -88 +88 @@
         }
 
-        $( '.menu-toggle' ).on( 'click', function() {
+        $( '.menu-toggle' ).on( 'click.twentythirteen', function() {
             nav.toggleClass( 'toggled-on' );
         } );
     } )();
-
 
     /**
@@ -100 +99 @@
      * @link http://www.nczonline.net/blog/2013/01/15/fixing-skip-to-content-links/
      */
-    _window.on( 'hashchange', function() {
+    _window.on( 'hashchange.twentythirteen', function() {
         var element = $( location.hash );