Ticket #29906: 29906-3-comment15.diff

wp-includes/admin-bar.php

@@ -101 +101 @@
         $wp_admin_bar->add_menu( array(
                 'id'    => 'wp-logo',
                 'title' => '<span class="ab-icon"></span><span class="screen-reader-text">' . __( 'About WordPress' ) . '</span>',
-                'href'  => self_admin_url( 'about.php' ),
         ) );
 
         if ( is_user_logged_in() ) {
@@ -187 +186 @@
                 'id'        => 'my-account',
                 'parent'    => 'top-secondary',
                 'title'     => $howdy . $avatar,
-                'href'      => $profile_url,
+                'href'      => '#',
                 'meta'      => array(
                         'class'     => $class,
                 ),
@@ -224 +223 @@
                 'parent' => 'user-actions',
                 'id'     => 'user-info',
                 'title'  => $user_info,
-                'href'   => $profile_url,
+//              'href'   => $profile_url,
                 'meta'   => array(
                         'tabindex' => -1,
                 ),
@@ -276 +275 @@
         $wp_admin_bar->add_menu( array(
                 'id'    => 'site-name',
                 'title' => $title,
-                'href'  => is_admin() ? home_url( '/' ) : admin_url(),
+                'href'  => is_admin() ? home_url( '/' ) : '',
         ) );
 
         // Create submenu items.
 
         if ( is_admin() ) {
-                // Add an option to visit the site.
-                $wp_admin_bar->add_menu( array(
-                        'parent' => 'site-name',
-                        'id'     => 'view-site',
-                        'title'  => __( 'Visit Site' ),
-                        'href'   => home_url( '/' ),
-                ) );
 
                 if ( is_blog_admin() && is_multisite() && current_user_can( 'manage_sites' ) ) {
                         $wp_admin_bar->add_menu( array(
@@ -599 +591 @@
         $wp_admin_bar->add_menu( array(
                 'id'    => 'new-content',
                 'title' => $title,
-                'href'  => admin_url( current( array_keys( $actions ) ) ),
         ) );
 
         foreach ( $actions as $link => $action ) {

wp-includes/css/admin-bar.css

@@ -206 +206 @@
         right: 100%;
 }
 
-#wpadminbar .ab-top-menu > li > .ab-item:focus,
 #wpadminbar.nojq .quicklinks .ab-top-menu > li > .ab-item:focus,
-#wpadminbar .ab-top-menu > li:hover > .ab-item,
 #wpadminbar .ab-top-menu > li.hover > .ab-item {
         background: #32373c;
         color: #45bbe6;
 }
 
-#wpadminbar > #wp-toolbar li:hover span.ab-label,
 #wpadminbar > #wp-toolbar li.hover span.ab-label,
 #wpadminbar > #wp-toolbar a:focus span.ab-label {
         color: #45bbe6;
@@ -243 +240 @@
 
 #wpadminbar .ab-icon:before,
 #wpadminbar .ab-item:before,
+#wpadminbar .ab-item,
 #wpadminbar #adminbarsearch:before {
         position: relative;
         -webkit-transition: all .1s ease-in-out;
@@ -275 +273 @@
 #wpadminbar .quicklinks .menupop.hover ul li a:focus,
 #wpadminbar.nojs .quicklinks .menupop:hover ul li a:hover,
 #wpadminbar.nojs .quicklinks .menupop:hover ul li a:focus,
-#wpadminbar li:hover .ab-icon:before,
-#wpadminbar li:hover .ab-item:before,
 #wpadminbar li a:focus .ab-icon:before,
 #wpadminbar li .ab-item:focus:before,
 #wpadminbar li.hover .ab-icon:before,

wp-includes/js/admin-bar.js

@@ -28 +28 @@
                                         e.stopPropagation();
                                         e.preventDefault();
                                         el.addClass('hover');
-                                }
+                                } else if ( el.children('.ab-empty-item') ) {
+                    if ( el.hasClass('hover') ) {
+                        adminbar.find('li.menupop.hover').removeClass('hover');
+                    }
+                }
 
                                 if ( unbind ) {
                                         $('li.menupop').off('click.wp-mobile-hover');
@@ -124 +128 @@
                 });
 
                 $('#wpadminbar').click( function(e) {
-                        if ( e.target.id != 'wpadminbar' && e.target.id != 'wp-admin-bar-top-secondary' )
-                                return;
+                        if ( e.target.id != 'wpadminbar' ) {
+                return;
+            } else {
+                adminbar.find('li.menupop.hover').removeClass('hover');
+                return;
+            }
 
                         e.preventDefault();
                         $('html, body').animate({ scrollTop: 0 }, 'fast');