Changeset 19328 for trunk/wp-includes/class-wp-admin-bar.php

Timestamp:

11/18/2011 12:12:57 AM (15 years ago)

Author:

koopersmith

Message:

Allow linkless items in the admin bar. Improve non-jQuery admin bar tabbing. fixes #19277, #19149, #19164, #15519. see #18197, #19088.

File:

• trunk/wp-includes/class-wp-admin-bar.php (modified) (2 diffs)

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

@@ -164 +164 @@
 
                 $is_parent = (bool) $node->children->primary;
+                $has_link  = (bool) $node->href;
 
                 $menuclass = $is_parent ? 'menupop' : '';
@@ -172 +173 @@
                 ?>
 
-                <li id="<?php echo esc_attr( "wp-admin-bar-{$node->id}" ); ?>" class="<?php echo esc_attr( $menuclass ); ?>">
-                        <a tabindex="<?php echo (int) $tabindex; ?>" href="<?php echo esc_url( $node->href ) ?>"<?php
-                                if ( ! empty( $node->meta['onclick'] ) ) :
-                                        ?> onclick="<?php echo esc_js( $node->meta['onclick'] ); ?>"<?php
+                <li id="<?php echo esc_attr( "wp-admin-bar-{$node->id}" ); ?>" class="<?php echo esc_attr( $menuclass ); ?>"><?php
+                        if ( $has_link ):
+                                ?><a class="ab-item" tabindex="<?php echo (int) $tabindex; ?>" href="<?php echo esc_url( $node->href ) ?>"<?php
+                                        if ( ! empty( $node->meta['onclick'] ) ) :
+                                                ?> onclick="<?php echo esc_js( $node->meta['onclick'] ); ?>"<?php
+                                        endif;
+                                if ( ! empty( $node->meta['target'] ) ) :
+                                        ?> target="<?php echo esc_attr( $node->meta['target'] ); ?>"<?php
                                 endif;
-                        if ( ! empty( $node->meta['target'] ) ) :
-                                ?> target="<?php echo esc_attr( $node->meta['target'] ); ?>"<?php
+                                if ( ! empty( $node->meta['title'] ) ) :
+                                        ?> title="<?php echo esc_attr( $node->meta['title'] ); ?>"<?php
+                                endif;
+                                ?>><?php
+                        else:
+                                ?><div class="ab-item ab-empty-item" tabindex="<?php echo (int) $tabindex; ?>"><?php
                         endif;
-                        if ( ! empty( $node->meta['title'] ) ) :
-                                ?> title="<?php echo esc_attr( $node->meta['title'] ); ?>"<?php
+
+                        echo $node->title;
+
+                        if ( $has_link ):
+                                ?></a><?php
+                        else:
+                                ?></div><?php
                         endif;
 
-                        ?>><?php
-
-                        echo $node->title;
-
-                        ?></a>
-
-                        <?php
                         if ( $is_parent ) :
                                 ?><div class="ab-sub-wrapper"><?php