Ticket #37513: 37513.3.patch

wp-includes/class-wp-admin-bar.php

@@ -258 +258 @@
         }
 
         /**
+         * @param string|object $node  The node ID or object
+         * @param array         $tree  An array of tree node ID's
+         *
+         * @return array
+         */
+        final public function get_node_tree( $node, $tree = array() ) {
+
+                if ( ! is_object( $node ) && isset( $this->nodes[ $node ] ) ) {
+                        $node = $this->nodes[ $node ];
+                }
+
+                if ( isset( $node->parent ) && 'root' !== $node->parent  ) {
+                        array_unshift( $tree, $node->parent );
+                        $tree = $this->get_node_tree( $node->parent, $tree );
+                }
+
+                return $tree;
+        }
+
+        /**
+         * @param string|object $node    The node ID or object
+         * @param string        $search  The search item ID
+         *
+         * @return bool
+         */
+        final public function is_tree( $node, $search ) {
+                $tree = $this->get_node_tree( $node );
+                if ( in_array( $search, $tree ) ) {
+                        return true;
+                }
+                return false;
+        }
+
+        /**
          * @access public
          */
         public function render() {
@@ -478 +512 @@
                 $has_link              = ! empty( $node->href );
                 $is_root_top_item      = 'root-default' === $node->parent;
                 $is_top_secondary_item = 'top-secondary' === $node->parent;
+                $is_root_top_tree = $this->is_tree( $node, 'root-default' );
+                $is_top_secondary_tree = $this->is_tree( $node, 'top-secondary' );
 
                 // Allow only numeric values, then casted to integers, and allow a tabindex value of `0` for a11y.
                 $tabindex = ( isset( $node->meta['tabindex'] ) && is_numeric( $node->meta['tabindex'] ) ) ? (int) $node->meta['tabindex'] : '';
                 $aria_attributes = ( '' !== $tabindex ) ? ' tabindex="' . $tabindex . '"' : '';
 
-                $menuclass = $arrow_right = '';
+                $menuclass = $arrow = '';
 
                 if ( $is_parent ) {
                         $menuclass = 'menupop ';
@@ -491 +527 @@
                 }
 
                 // Print the right arrow icon for the primary menu children with children.
-                if ( ! $is_root_top_item && ! $is_top_secondary_item && $is_parent ) {
-                        $arrow_right = '<span class="wp-admin-bar-arrow-right" aria-hidden="true"></span>';
+                if ( ! $is_root_top_item && ! $is_top_secondary_item && ! $is_top_secondary_tree && $is_parent ) {
+                        $arrow = '<span class="wp-admin-bar-arrow-right" aria-hidden="true"></span>';
                 }
+                // Print the left arrow icon for the secondary menu children with children.
+                elseif ( ! $is_root_top_item && ! $is_top_secondary_item && ! $is_root_top_tree && $is_parent ) {
+                        $arrow = '<span class="wp-admin-bar-arrow-left" aria-hidden="true"></span>';
+                }
 
                 if ( ! empty( $node->meta['class'] ) )
                         $menuclass .= $node->meta['class'];
@@ -539 +579 @@
                                 ?>><?php
                         endif;
 
-                        echo $arrow_right . $node->title;
+                        echo $arrow . $node->title;
 
                         if ( $has_link ) :
                                 ?></a><?php

wp-includes/css/admin-bar.css

@@ -235 +235 @@
 #wpadminbar > #wp-toolbar > #wp-admin-bar-root-default .ab-icon,
 #wpadminbar .ab-icon,
 #wpadminbar .ab-item:before,
+.wp-admin-bar-arrow-left,
 .wp-admin-bar-arrow-right {
         position: relative;
         float: left;
@@ -313 +314 @@
         color: #00b9eb;
 }
 
+#wpadminbar .menupop .menupop > .ab-item .wp-admin-bar-arrow-left:before,
 #wpadminbar .menupop .menupop > .ab-item .wp-admin-bar-arrow-right:before,
 #wpadminbar .ab-top-secondary .menupop .menupop > .ab-item:before {
         position: absolute;
@@ -327 +329 @@
         padding-right: 2em;
 }
 
+#wpadminbar .menupop .menupop > .ab-item .wp-admin-bar-arrow-left:before {
+        top: 1px;
+        left: 6px;
+        padding: 4px 0;
+        content: "\f141";
+        color: inherit;
+}
+
 #wpadminbar .menupop .menupop > .ab-item .wp-admin-bar-arrow-right:before {
         top: 1px;
         right: 10px;
@@ -340 +350 @@
         padding-right: 1em;
 }
 
-#wpadminbar .ab-top-secondary .menupop .menupop > .ab-item:before {
-        top: 1px;
-        left: 6px;
-        content: "\f141";
-}
-
 #wpadminbar .quicklinks .menupop ul.ab-sub-secondary {
         display: block;
         position: relative;