<!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>[39073] trunk/src/wp-content/themes/twentyseventeen: Twenty Seventeen: Remove unnecessary l10n variables</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" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/39073">39073</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/39073","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>davidakennedy</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-11-01 18:59:06 +0000 (Tue, 01 Nov 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Twenty Seventeen: Remove unnecessary l10n variables
* Relies on header skip link instead of l10n variables in JavaScript.
* Fixes issue where scroll down arrow appeared next to the navigation on the front page with no header image or video. It now only appears with a big header.
Props enodekciw, laurelfulford.
Fixes <a href="https://core.trac.wordpress.org/ticket/38502">#38502</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentyseventeenassetsjsglobaljs">trunk/src/wp-content/themes/twentyseventeen/assets/js/global.js</a></li>
<li><a href="#trunksrcwpcontentthemestwentyseventeenfunctionsphp">trunk/src/wp-content/themes/twentyseventeen/functions.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyseventeentemplatepartsnavigationnavigationtopphp">trunk/src/wp-content/themes/twentyseventeen/template-parts/navigation/navigation-top.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpcontentthemestwentyseventeenassetsjsglobaljs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyseventeen/assets/js/global.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/assets/js/global.js 2016-11-01 17:25:58 UTC (rev 39072)
+++ trunk/src/wp-content/themes/twentyseventeen/assets/js/global.js 2016-11-01 18:59:06 UTC (rev 39073)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -142,20 +142,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Fires on document ready
</span><span class="cx" style="display: block; padding: 0 10px"> $( document ).ready( function() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Let's fire some JavaScript!
- setNavProps();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If navigation menu is present on page, setNavProps and adjustScrollClass
+ if( $navigation.length ) {
+ setNavProps();
+ adjustScrollClass();
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If 'Scroll Down' arrow in present on page, calculate scroll offset and bind an event handler to the click event
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $menuScrollDown.length ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * 'Scroll Down' arrow in menu area
- */
</del><span class="cx" style="display: block; padding: 0 10px"> if ( $( 'body' ).hasClass( 'admin-bar' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> menuTop -= 32;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $( 'body' ).hasClass( 'blog' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> menuTop -= 30; // The div for latest posts has no space above content, add some to account for this
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! $navigation.length ) {
+ navigationOuterHeight = 0;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $menuScrollDown.click( function( e ) {
</span><span class="cx" style="display: block; padding: 0 10px"> e.preventDefault();
</span><span class="cx" style="display: block; padding: 0 10px"> $( window ).scrollTo( '#primary', {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,8 +168,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> offset: { 'top': menuTop - navigationOuterHeight }
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- adjustScrollClass();
</del><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> adjustHeaderHeight();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -175,7 +178,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( 'true' === twentyseventeenScreenReaderText.has_navigation ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If navigation menu is present on page, adjust it on scroll and screen resize
+ if ( $navigation.length ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // On scroll, we want to stick/unstick the navigation
</span><span class="cx" style="display: block; padding: 0 10px"> $( window ).on( 'scroll', function() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -187,7 +191,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $( window ).resize( function() {
</span><span class="cx" style="display: block; padding: 0 10px"> setNavProps();
</span><span class="cx" style="display: block; padding: 0 10px"> setTimeout( adjustScrollClass, 500 );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- setTimeout( adjustHeaderHeight, 1000 );
</del><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -196,6 +199,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> resizeTimer = setTimeout( function() {
</span><span class="cx" style="display: block; padding: 0 10px"> belowEntryMetaClass( 'blockquote.alignleft, blockquote.alignright' );
</span><span class="cx" style="display: block; padding: 0 10px"> }, 300 );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ setTimeout( adjustHeaderHeight, 1000 );
</ins><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> }( jQuery ) );
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyseventeenfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyseventeen/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/functions.php 2016-11-01 17:25:58 UTC (rev 39072)
+++ trunk/src/wp-content/themes/twentyseventeen/functions.php 2016-11-01 18:59:06 UTC (rev 39073)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -368,12 +368,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $twentyseventeen_l10n = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'quote' => twentyseventeen_get_svg( array( 'icon' => 'quote-right' ) ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'has_navigation' => 'false',
</del><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( has_nav_menu( 'top' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'twentyseventeen-navigation', get_theme_file_uri( '/assets/js/navigation.js' ), array(), '1.0', true );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $twentyseventeen_l10n['has_navigation'] = 'true';
</del><span class="cx" style="display: block; padding: 0 10px"> $twentyseventeen_l10n['expand'] = __( 'Expand child menu', 'twentyseventeen' );
</span><span class="cx" style="display: block; padding: 0 10px"> $twentyseventeen_l10n['collapse'] = __( 'Collapse child menu', 'twentyseventeen' );
</span><span class="cx" style="display: block; padding: 0 10px"> $twentyseventeen_l10n['icon'] = twentyseventeen_get_svg( array( 'icon' => 'angle-down', 'fallback' => true ) );
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyseventeentemplatepartsnavigationnavigationtopphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyseventeen/template-parts/navigation/navigation-top.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/template-parts/navigation/navigation-top.php 2016-11-01 17:25:58 UTC (rev 39072)
+++ trunk/src/wp-content/themes/twentyseventeen/template-parts/navigation/navigation-top.php 2016-11-01 18:59:06 UTC (rev 39073)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -16,7 +16,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu_id' => 'top-menu',
</span><span class="cx" style="display: block; padding: 0 10px"> ) ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php if ( twentyseventeen_is_frontpage() || ( is_home() && is_front_page() ) ) : ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( ( twentyseventeen_is_frontpage() || ( is_home() && is_front_page() ) ) && has_custom_header() ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <a href="#content" class="menu-scroll-down"><?php echo twentyseventeen_get_svg( array( 'icon' => 'arrow-right' ) ); ?><span class="screen-reader-text"><?php _e( 'Scroll Down', 'twentyseventeen' ); ?></span></a>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </nav><!-- #site-navigation -->
</span></span></pre>
</div>
</div>
</body>
</html>