From e6b986ec2b7dc5a75862405f0152013c610bbcfc Mon Sep 17 00:00:00 2001
From: Lance Willett <lancewillett@git.wordpress.org>
Date: Tue, 16 Apr 2013 21:51:07 +0000
Subject: [PATCH] Twenty Thirteen: improvements to functions.js to add
 namespacing to events and simplify repeatable functions. See #23875.

git-svn-id: https://develop.svn.wordpress.org/trunk@24004 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../themes/twentythirteen/js/functions.js     | 57 +++++++++----------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/wp-content/themes/twentythirteen/js/functions.js b/wp-content/themes/twentythirteen/js/functions.js
index 2b7cf45c77..d3f8c0e876 100644
--- a/wp-content/themes/twentythirteen/js/functions.js
+++ b/wp-content/themes/twentythirteen/js/functions.js
@@ -11,44 +11,44 @@
 	    _window       = $( window ),
 	    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 )
 			navbarOffset = navbar.offset().top - toolbarOffset;
@@ -62,7 +62,7 @@
 	/**
 	 * 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 )
 			$( 'html, body' ).animate( { scrollTop: 0 }, 'fast' );
@@ -87,19 +87,18 @@
 			return;
 		}
 
-		$( '.menu-toggle' ).on( 'click', function() {
+		$( '.menu-toggle' ).on( 'click.twentythirteen', function() {
 			nav.toggleClass( 'toggled-on' );
 		} );
 	} )();
 
-
 	/**
 	 * Makes "skip to content" link work correctly in IE9 and Chrome for better
 	 * accessibility.
 	 *
 	 * @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 );
 
 		if ( element ) {