<!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>[24511] trunk/wp-content/themes/twentythirteen: Twenty Thirteen: functions.js optimizations, props obenland.</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 { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { 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/24511">24511</a></dd>
<dt>Author</dt> <dd>lancewillett</dd>
<dt>Date</dt> <dd>2013-06-25 21:09:00 +0000 (Tue, 25 Jun 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Twenty Thirteen: functions.js optimizations, props obenland. Fixes <a href="http://core.trac.wordpress.org/ticket/24643">#24643</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpcontentthemestwentythirteenfunctionsphp">trunk/wp-content/themes/twentythirteen/functions.php</a></li>
<li><a href="#trunkwpcontentthemestwentythirteenjsfunctionsjs">trunk/wp-content/themes/twentythirteen/js/functions.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpcontentthemestwentythirteenfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentythirteen/functions.php (24510 => 24511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentythirteen/functions.php 2013-06-25 19:03:17 UTC (rev 24510)
+++ trunk/wp-content/themes/twentythirteen/functions.php 2013-06-25 21:09:00 UTC (rev 24511)
</span><span class="lines">@@ -218,7 +218,7 @@
</span><span class="cx"> wp_enqueue_script( 'jquery-masonry' );
</span><span class="cx">
</span><span class="cx"> // Loads JavaScript file with functionality specific to Twenty Thirteen.
</span><del>- wp_enqueue_script( 'twentythirteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20130423', true );
</del><ins>+ wp_enqueue_script( 'twentythirteen-script', get_template_directory_uri() . '/js/functions.js', array( 'jquery' ), '20130625', true );
</ins><span class="cx">
</span><span class="cx"> // Loads our main stylesheet.
</span><span class="cx"> wp_enqueue_style( 'twentythirteen-style', get_stylesheet_uri() );
</span></span></pre></div>
<a id="trunkwpcontentthemestwentythirteenjsfunctionsjs"></a>
<div class="modfile"><h4>Modified: trunk/wp-content/themes/twentythirteen/js/functions.js (24510 => 24511)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-content/themes/twentythirteen/js/functions.js 2013-06-25 19:03:17 UTC (rev 24510)
+++ trunk/wp-content/themes/twentythirteen/js/functions.js 2013-06-25 21:09:00 UTC (rev 24511)
</span><span class="lines">@@ -5,28 +5,23 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> ( function( $ ) {
</span><del>- var html = $( 'html' ),
- body = $( 'body' ),
- _window = $( window ),
- adjustFooter,
</del><ins>+ var body = $( 'body' ),
+ _window = $( window ),
</ins><span class="cx">
</span><span class="cx"> /**
</span><del>- * 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.
</del><ins>+ * 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.
</ins><span class="cx"> */
</span><del>- adjustFooter = function() {
- var sidebar = $( '#secondary .widget-area' ),
- secondary = ( 0 == sidebar.length ) ? -40 : sidebar.height(),
- margin = $( '#tertiary .widget-area' ).height() - $( '#content' ).height() - secondary;
</del><ins>+ $( function() {
+ if ( body.is( '.sidebar' ) ) {
+ var sidebar = $( '#secondary .widget-area' ),
+ secondary = ( 0 == sidebar.length ) ? -40 : sidebar.height(),
+ margin = $( '#tertiary .widget-area' ).height() - $( '#content' ).height() - secondary;
</ins><span class="cx">
</span><del>- if ( margin > 0 && _window.innerWidth() > 999 )
- $( '#colophon' ).css( 'margin-top', margin + 'px' );
- };
-
- $( function() {
- if ( body.is( '.sidebar' ) )
- adjustFooter();
</del><ins>+ if ( margin > 0 && _window.innerWidth() > 999 )
+ $( '#colophon' ).css( 'margin-top', margin + 'px' );
+ }
</ins><span class="cx"> } );
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -38,11 +33,11 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> button = nav.find( '.menu-toggle' );
</span><del>- menu = nav.find( '.nav-menu' );
</del><span class="cx"> if ( ! button )
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // Hide button if menu is missing or empty.
</span><ins>+ menu = nav.find( '.nav-menu' );
</ins><span class="cx"> if ( ! menu || ! menu.children().length ) {
</span><span class="cx"> button.hide();
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
</body>
</html>