Ticket #38502: 38502.patch

assets/js/global.js

@@ -142 +142 @@
         // Fires on document ready
         $( document ).ready( function() {
 
-                // Let's fire some JavaScript!
-                setNavProps();
+                // If navigation menu is present on page, setNavProps and adjustScrollClass
+                if( $navigation.length ) {
 
+                        setNavProps();
+                        adjustScrollClass();
+                }
+
+                // If 'Scroll Down' arrow in present on page, calculate scroll offset and bind an event handler to the click event
                 if ( $menuScrollDown.length ) {
 
-                        /**
-                         * 'Scroll Down' arrow in menu area
-                         */
                         if ( $( 'body' ).hasClass( 'admin-bar' ) ) {
                                 menuTop -= 32;
                         }
@@ -156 +158 @@
                         if ( $( 'body' ).hasClass( 'blog' ) ) {
                                 menuTop -= 30; // The div for latest posts has no space above content, add some to account for this
                         }
+                        if ( ! $navigation.length ) { 
+                                navigationOuterHeight = 0;
+                        }
+
                         $menuScrollDown.click( function( e ) {
                                 e.preventDefault();
                                 $( window ).scrollTo( '#primary', {
@@ -163 +169 @@
                                         offset: { 'top': menuTop - navigationOuterHeight }
                                 } );
                         } );
-
-                        adjustScrollClass();
                 }
 
                 adjustHeaderHeight();
@@ -175 +179 @@
                 }
         } );
 
-        if ( 'true' === twentyseventeenScreenReaderText.has_navigation ) {
+        // If navigation menu is present on page, adjust it on scroll and screen resize
+        if ( $navigation.length ) {
 
                 // On scroll, we want to stick/unstick the navigation
                 $( window ).on( 'scroll', function() {
@@ -187 +192 @@
                 $( window ).resize( function() {
                         setNavProps();
                         setTimeout( adjustScrollClass, 500 );
-                        setTimeout( adjustHeaderHeight, 1000 );
                 } );
         }
 
@@ -196 +200 @@
                 resizeTimer = setTimeout( function() {
                         belowEntryMetaClass( 'blockquote.alignleft, blockquote.alignright' );
                 }, 300 );
+                setTimeout( adjustHeaderHeight, 1000 );
         } );
 
 }( jQuery ) );

functions.php

@@ -305 +305 @@
 
         $twentyseventeen_l10n = array(
                 'quote'          => twentyseventeen_get_svg( array( 'icon' => 'quote-right' ) ),
-                'has_navigation' => 'false',
         );
 
         if ( has_nav_menu( 'top' ) ) {
                 wp_enqueue_script( 'twentyseventeen-navigation', get_theme_file_uri( '/assets/js/navigation.js' ), array(), '1.0', true );
-                $twentyseventeen_l10n['has_navigation'] = 'true';
                 $twentyseventeen_l10n['expand']         = __( 'Expand child menu', 'twentyseventeen' );
                 $twentyseventeen_l10n['collapse']       = __( 'Collapse child menu', 'twentyseventeen' );
                 $twentyseventeen_l10n['icon']           = twentyseventeen_get_svg( array( 'icon' => 'expand', 'fallback' => true ) );