Changeset 39073

Timestamp:

11/01/2016 06:59:06 PM (8 years ago)

Author:

davidakennedy

Message:

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 #38502.

Location:

trunk/src/wp-content/themes/twentyseventeen

Files:

• assets/js/global.js (modified) (6 diffs)
• functions.php (modified) (1 diff)
• template-parts/navigation/navigation-top.php (modified) (1 diff)

trunk/src/wp-content/themes/twentyseventeen/assets/js/global.js

@@ -143 +143 @@
     $( 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;
@@ -157 +158 @@
                 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();
@@ -164 +169 @@
                 } );
             } );
-
-            adjustScrollClass();
         }
 
@@ -176 +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
@@ -188 +192 @@
             setNavProps();
             setTimeout( adjustScrollClass, 500 );
-            setTimeout( adjustHeaderHeight, 1000 );
         } );
     }
@@ -197 +200 @@
             belowEntryMetaClass( 'blockquote.alignleft, blockquote.alignright' );
         }, 300 );
+        setTimeout( adjustHeaderHeight, 1000 );
     } );
 

trunk/src/wp-content/themes/twentyseventeen/functions.php

@@ -369 +369 @@
     $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' );

trunk/src/wp-content/themes/twentyseventeen/template-parts/navigation/navigation-top.php

@@ -17 +17 @@
     ) ); ?>
 
-    <?php if ( twentyseventeen_is_frontpage() || ( is_home() && is_front_page() ) ) : ?>
+    <?php if ( ( twentyseventeen_is_frontpage() || ( is_home() && is_front_page() ) ) && has_custom_header() ) : ?>
         <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>
     <?php endif; ?>