<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[23965] trunk/wp-content/themes/twentythirteen/js/functions.js: Twenty Thirteen: adjust JavaScript handling for scrolling and finding viewport heigh/width to better support various IE versions.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg > ul, #logmsg > ol { margin-left: 0; margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/23965">23965</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2013-04-11 16:11:46 +0000 (Thu, 11 Apr 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>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 <a href="http://core.trac.wordpress.org/ticket/23841">#23841</a>, props obenland.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentythirteenjsfunctionsjs">trunk/wp-content/themes/twentythirteen/js/functions.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentythirteenjsfunctionsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentythirteen/js/functions.js (23964 => 23965)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentythirteen/js/functions.js 2013-04-11 16:03:08 UTC (rev 23964)
+++ trunk/wp-content/themes/twentythirteen/js/functions.js 2013-04-11 16:11:46 UTC (rev 23965)
</span><span class="lines">@@ -5,7 +5,14 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> ( function( $ ) {
</span><del>- var twentyThirteen = {
</del><ins>+ var html = $( 'html' ),
+ body = $( 'body' ),
+ navbar = $( '#navbar' ),
+ _window = $( window ),
+ navbarOffset = -1,
+ toolbarOffset = body.is( '.admin-bar' ) ? 28 : 0,
+
+ twentyThirteen = {
</ins><span class="cx"> /**
</span><span class="cx"> * Adds a top margin to the footer if the sidebar widget area is
</span><span class="cx"> * higher than the rest of the page, to help the footer always
</span><span class="lines">@@ -16,7 +23,7 @@
</span><span class="cx"> secondary = ( 0 == sidebar.length ) ? -40 : sidebar.height(),
</span><span class="cx"> margin = $( '#tertiary .widget-area' ).height() - $( '#content' ).height() - secondary;
</span><span class="cx">
</span><del>- if ( margin > 0 && window.innerWidth > 999 )
</del><ins>+ if ( margin > 0 && _window.innerWidth() > 999 )
</ins><span class="cx"> $( '#colophon' ).css( 'margin-top', margin + 'px' );
</span><span class="cx"> },
</span><span class="cx">
</span><span class="lines">@@ -36,22 +43,17 @@
</span><span class="cx"> if ( body.is( '.sidebar' ) )
</span><span class="cx"> twentyThirteen.adjustFooter();
</span><span class="cx"> } );
</span><del>- $( window ).on( 'hashchange', twentyThirteen.adjustAnchor );
</del><ins>+ _window.on( 'hashchange', twentyThirteen.adjustAnchor );
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Displays the fixed navbar based on screen position.
</span><span class="cx"> */
</span><del>- var html = $( 'html' ),
- body = $( 'body' ),
- navbar = $( '#navbar' ),
- navbarOffset = -1,
- toolbarOffset = body.is( '.admin-bar' ) ? 28 : 0;
-
- $( window ).scroll( function() {
</del><ins>+ _window.scroll( function() {
+ var scrollOffset = ( typeof window.scrollY === 'undefined' ) ? document.documentElement.scrollTop : window.scrollY;
</ins><span class="cx"> if ( navbarOffset < 0 )
</span><span class="cx"> navbarOffset = navbar.offset().top - toolbarOffset;
</span><span class="cx">
</span><del>- if ( window.scrollY >= navbarOffset && 644 < window.innerWidth )
</del><ins>+ if ( scrollOffset >= navbarOffset && _window.innerWidth() > 644 )
</ins><span class="cx"> html.addClass( 'navbar-fixed' );
</span><span class="cx"> else
</span><span class="cx"> html.removeClass( 'navbar-fixed' );
</span><span class="lines">@@ -97,7 +99,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @link http://www.nczonline.net/blog/2013/01/15/fixing-skip-to-content-links/
</span><span class="cx"> */
</span><del>- $( window ).on( 'hashchange', function() {
</del><ins>+ _window.on( 'hashchange', function() {
</ins><span class="cx"> var element = $( location.hash );
</span><span class="cx">
</span><span class="cx"> if ( element ) {
</span></span></pre>
</div>
</div>
</body>
</html>