Changeset 43892 for branches/5.0/src/wp-content/themes/twentynineteen/inc/template-functions.php

Timestamp:

11/12/2018 11:19:13 PM (6 years ago)

Author:

allancole

Message:

Updating Twenty Nineteen, our new default theme for 2019, set for 5.0.

This update applies the following changes:

• Improve menu UI to support keyboard, click and touch interactions
• Improve variable scoping and js performance in menu interaction javascript
• Improve custom-colors for selected text, buttons and menu hover styles
• Improve margins structure for more consistency between editor and frontend
• Improve discussion avatars for simpler wording and better performance
• Improve fonts in list widgets and list blocks
• Improve comment responsive spacing and avatar display
• Improve various block styles to make them consistent between the editor and frontend
• Add tabbed browsing support for ie11
• Add backwards compatibility support for older versions of WordPress
• Add fallback styles for older versions of WP where Gutenberg is activated and then deactivated (backwards compatibility)
• Add sizes attribute for featured images to improve responsive performance
• Add focus-within polyfill
• Add a footer menu for secondary page links
• Fix editor styles to prevent conflicts with plugins that add meta boxes to the editor
• Fix columns block issues on small screens
• Fix empty-space font text cursor issue in Gutenberg editor
• Fix RTL floating styles so that left/right floats are honored
• Fix cover image block margins/padding
• Fix invalid rgba style
• Fix php warning when returning attributes
• Fix gallery widget margins to improve gallery grids
• Fix .entry-content selectors to prevent shortcodes, plugins and other unknown content from breaking the layout
• Remove translation escaping to follow code standards in previous default themes
• Remove custom color output in the fronten header when default color is selected
• Remove fly-out sub-sub-sub-menu behavior on desktop to prevent sub-menus from falling off the screen
• General code clean up and coding standards improvements

Initial development occurred on GitHub. See: ​https://github.com/WordPress/twentynineteen

Props allancole, karmatosed, kjellr, yingling017, mrasharirfan, milana_cap, fabiankaegy, westonruter, aaronjorbin, netweb, b-07, khleomix, blowery, dereksmart, jasmussen, audrasjb, nielslange, mmaumio, dimadin, joyously, anevins12, peterwilsoncc, dannycooper, icaleb, siriokun, technosiren, travel_girl, azchughtai, ianbelanger, nadim1992, ismailelkorchi, nativeinside, chetan200891, icaleb, grapplerulrich, ocean90, joshfeck, frankew, abdulwahab610, mendezcode, eliorivero, melchoyce, joen, laurelfulford, mdawaffe, kraftbj, dsmart, mukeshpanchal27, burhandodhy, crunnells, Ismail-elkorchi, aryaprakasa, @tlxo, @themeroots, @whizbangik, @yingles, @youthkee, @brentswisher, @smy315, @ahmadawais, @desi-developer.

File:

• branches/5.0/src/wp-content/themes/twentynineteen/inc/template-functions.php (modified) (7 diffs)

branches/5.0/src/wp-content/themes/twentynineteen/inc/template-functions.php

@@ -72 +72 @@
 function twentynineteen_get_the_archive_title() {
     if ( is_category() ) {
-        $title = esc_html__( 'Category Archives: ', 'twentynineteen' ) . '<span class="page-description">' . single_term_title( '', false ) . '</span>';
+        $title = __( 'Category Archives: ', 'twentynineteen' ) . '<span class="page-description">' . single_term_title( '', false ) . '</span>';
     } elseif ( is_tag() ) {
-        $title = esc_html__( 'Tag Archives: ', 'twentynineteen' ) . '<span class="page-description">' . single_term_title( '', false ) . '</span>';
+        $title = __( 'Tag Archives: ', 'twentynineteen' ) . '<span class="page-description">' . single_term_title( '', false ) . '</span>';
     } elseif ( is_author() ) {
-        $title = esc_html__( 'Author Archives: ', 'twentynineteen' ) . '<span class="page-description">' . get_the_author_meta( 'display_name' ) . '</span>';
+        $title = __( 'Author Archives: ', 'twentynineteen' ) . '<span class="page-description">' . get_the_author_meta( 'display_name' ) . '</span>';
     } elseif ( is_year() ) {
-        $title = esc_html__( 'Yearly Archives: ', 'twentynineteen' ) . '<span class="page-description">' . get_the_date( _x( 'Y', 'yearly archives date format', 'twentynineteen' ) ) . '</span>';
+        $title = __( 'Yearly Archives: ', 'twentynineteen' ) . '<span class="page-description">' . get_the_date( _x( 'Y', 'yearly archives date format', 'twentynineteen' ) ) . '</span>';
     } elseif ( is_month() ) {
-        $title = esc_html__( 'Monthly Archives: ', 'twentynineteen' ) . '<span class="page-description">' . get_the_date( _x( 'F Y', 'monthly archives date format', 'twentynineteen' ) ) . '</span>';
+        $title = __( 'Monthly Archives: ', 'twentynineteen' ) . '<span class="page-description">' . get_the_date( _x( 'F Y', 'monthly archives date format', 'twentynineteen' ) ) . '</span>';
     } elseif ( is_day() ) {
-        $title = esc_html__( 'Daily Archives: ', 'twentynineteen' ) . '<span class="page-description">' . get_the_date() . '</span>';
+        $title = __( 'Daily Archives: ', 'twentynineteen' ) . '<span class="page-description">' . get_the_date() . '</span>';
     } elseif ( is_post_type_archive() ) {
-        $title = esc_html__( 'Post Type Archives: ', 'twentynineteen' ) . '<span class="page-description">' . post_type_archive_title( '', false ) . '</span>';
+        $title = __( 'Post Type Archives: ', 'twentynineteen' ) . '<span class="page-description">' . post_type_archive_title( '', false ) . '</span>';
     } elseif ( is_tax() ) {
         $tax = get_taxonomy( get_queried_object()->taxonomy );
@@ -90 +90 @@
         $title = sprintf( esc_html__( '%s Archives:', 'twentynineteen' ), $tax->labels->singular_name );
     } else {
-        $title = esc_html__( 'Archives:', 'twentynineteen' );
+        $title = __( 'Archives:', 'twentynineteen' );
     }
     return $title;
@@ -112 +112 @@
     return true;
 }
+
+/**
+ * Add custom sizes attribute to responsive image functionality for post thumbnails.
+ *
+ * @origin Twenty Nineteen 1.0
+ *
+ * @param array $attr  Attributes for the image markup.
+ * @return string Value for use in post thumbnail 'sizes' attribute.
+ */
+function twentynineteen_post_thumbnail_sizes_attr( $attr ) {
+
+    if ( is_admin() ) {
+        return $attr;
+    }
+
+    if ( ! is_singular() ) {
+        $attr['sizes'] = '(max-width: 34.9rem) calc(100vw - 2rem), (max-width: 53rem) calc(8 * (100vw / 12)), (min-width: 53rem) calc(6 * (100vw / 12)), 100vw';
+    }
+
+    return $attr;
+}
+add_filter( 'wp_get_attachment_image_attributes', 'twentynineteen_post_thumbnail_sizes_attr', 10, 1 );
 
 /**
@@ -141 +163 @@
 function twentynineteen_get_discussion_data() {
     static $discussion, $post_id;
+
     $current_post_id = get_the_ID();
-    if ( $current_post_id === $post_id ) { /* If we have discussion information for post ID, return cached object */
-        return $discussion;
-    }
-    $authors    = array();
-    $commenters = array();
-    $user_id    = -1; // is_user_logged_in() ? get_current_user_id() : -1;
-    $comments   = get_comments(
+    if ( $current_post_id === $post_id ) {
+        return $discussion; /* If we have discussion information for post ID, return cached object */
+    } else {
+        $post_id = $current_post_id;
+    }
+
+    $comments = get_comments(
         array(
             'post_id' => $current_post_id,
@@ -154 +177 @@
             'order'   => get_option( 'comment_order', 'asc' ), /* Respect comment order from Settings » Discussion. */
             'status'  => 'approve',
+            'number'  => 20, /* Only retrieve the last 20 comments, as the end goal is just 6 unique authors */
         )
     );
+
+    $authors = array();
     foreach ( $comments as $comment ) {
-        $comment_user_id = (int) $comment->user_id;
-        if ( $comment_user_id !== $user_id ) {
-            $authors[]    = ( $comment_user_id > 0 ) ? $comment_user_id : $comment->comment_author_email;
-            $commenters[] = $comment->comment_author_email;
-        }
-    }
+        $authors[] = ( (int) $comment->user_id > 0 ) ? (int) $comment->user_id : $comment->comment_author_email;
+    }
+
     $authors    = array_unique( $authors );
-    $responses  = count( $commenters );
-    $commenters = array_unique( $commenters );
-    $post_id    = $current_post_id;
     $discussion = (object) array(
-        'authors'    => array_slice( $authors, 0, 6 ), /* Unique authors commenting on post (a subset of), excluding current user. */
-        'commenters' => count( $commenters ),          /* Number of commenters involved in discussion, excluding current user. */
-        'responses'  => $responses,                    /* Number of responses, excluding responses from current user. */
+        'authors'   => array_slice( $authors, 0, 6 ),           /* Six unique authors commenting on the post. */
+        'responses' => get_comments_number( $current_post_id ), /* Number of responses. */
     );
+
     return $discussion;
 }
+
+/**
+ * Add an extra menu to our nav for our priority+ navigation to use
+ *
+ * @param object $nav_menu  Nav menu.
+ * @param object $args      Nav menu args.
+ * @return string More link for hidden menu items.
+ */
+function twentynineteen_add_ellipses_to_nav( $nav_menu, $args ) {
+
+    if ( 'menu-1' === $args->theme_location ) :
+
+        $nav_menu .= '<div class="main-menu-more"   >';
+        $nav_menu .= '<ul class="main-menu" tabindex="0">';
+        $nav_menu .= '<li class="menu-item menu-item-has-children">';
+        $nav_menu .= '<a href="#" class="screen-reader-text" aria-label="More" aria-haspopup="true" aria-expanded="false">' . esc_html( 'More', 'twentynineteen' ) . '</a>';
+        $nav_menu .= '<span class="submenu-expand main-menu-more-toggle" tabindex="-1">';
+        $nav_menu .= twentynineteen_get_icon_svg( 'arrow_drop_down_ellipsis' );
+        $nav_menu .= '</span>';
+        $nav_menu .= '<ul class="sub-menu hidden-links is-hidden">';
+        $nav_menu .= '<li id="menu-item--1" class="mobile-parent-nav-menu-item menu-item--1">';
+        $nav_menu .= '<a class="menu-item-link-return" id="menu-item-link-return-1877" href="#menu-item-link-1877" onclick="event.preventDefault();" tabindex="-1">';
+        $nav_menu .= twentynineteen_get_icon_svg( 'chevron_left' );
+        $nav_menu .= esc_html__( 'Back', 'twentynineteen' );
+        $nav_menu .= '</a>';
+        $nav_menu .= '</li>';
+        $nav_menu .= '</ul>';
+        $nav_menu .= '</li>';
+        $nav_menu .= '</ul>';
+        $nav_menu .= '</div>';
+
+    endif;
+
+    return $nav_menu;
+}
+add_filter( 'wp_nav_menu', 'twentynineteen_add_ellipses_to_nav', 10, 2 );
 
 /**
@@ -217 +273 @@
         // @todo Only do this for nested submenus? If on a first-level submenu, then really the link could be "#" since the desire is to remove the target entirely.
         $link = sprintf(
-            '<a class="menu-item-link-return" id="%1$s" href="%2$s" onclick="%3$s" tabindex="-1">%4$s',
-            esc_attr( "menu-item-link-return-{$item->original_id}" ),
-            esc_attr( "#menu-item-link-{$item->original_id}" ),
-            esc_attr( 'event.preventDefault();' ),
+            '<span class="menu-item-link-return" tabindex="-1">%s',
             twentynineteen_get_icon_svg( 'chevron_left', 24 )
         );
 
+        // replace opening <a> with <span>
         $output = preg_replace(
             '/<a\s.*?>/',
@@ -230 +284 @@
             1 // Limit.
         );
+
+        // replace closing </a> with </span>
+        $output = preg_replace(
+            '#</a>#i',
+            '</span>',
+            $output,
+            1 // Limit.
+        );
+
     } elseif ( in_array( 'menu-item-has-children', $item->classes, true ) ) {
-        // Add an ID to the link element itself to facilitate navigation from submenu back to parent.
-        $output = preg_replace( '/(?<=<a\s)/', sprintf( ' id="%s" ', esc_attr( "menu-item-link-{$item->ID}" ) ), $output );
 
         // Add SVG icon to parent items.
-        if ( 0 === $depth ) {
-            $icon = twentynineteen_get_icon_svg( 'keyboard_arrow_down', 24 );
-        } else {
-            $icon = twentynineteen_get_icon_svg( 'chevron_right', 24 );
-        }
-
-        // @todo We might as well just go back to using the SVG element if the link approach is not suitable for no-JS environments.
-        $link = sprintf(
-            '<a class="mobile-submenu-expand" href="%s" onclick="%s" tabindex="-1">%s</a>',
-            esc_attr( "#menu-item-link-return-{$item->ID}" ),
-            esc_attr( 'event.preventDefault();' ),
+        $icon = twentynineteen_get_icon_svg( 'keyboard_arrow_down', 24 );
+
+        $output .= sprintf(
+            '<span class="submenu-expand" tabindex="-1">%s</span>',
             $icon
         );
-
-        $output .= $link;
-        $output .= "<span class='desktop-submenu-expand'>$icon</span>";
     }