Ticket #29906: 29906.5.diff

src/wp-includes/css/admin-bar.css

@@ -207 +207 @@
         right: 100%;
 }
 
-#wpadminbar .ab-top-menu > li > .ab-item:focus,
+#wpadminbar:not(.mobile) .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:not(.mobile) .ab-top-menu > li:hover > .ab-item,
 #wpadminbar .ab-top-menu > li.hover > .ab-item {
         background: #32373c;
         color: #00b9eb;
 }
 
-#wpadminbar > #wp-toolbar li:hover span.ab-label,
+#wpadminbar:not(.mobile) > #wp-toolbar li:hover span.ab-label,
 #wpadminbar > #wp-toolbar li.hover span.ab-label,
-#wpadminbar > #wp-toolbar a:focus span.ab-label {
+#wpadminbar:not(.mobile) > #wp-toolbar a:focus span.ab-label {
         color: #00b9eb;
 }
 

src/wp-includes/js/admin-bar.js

@@ -28 +28 @@
                                         e.stopPropagation();
                                         e.preventDefault();
                                         el.addClass('hover');
+                                } else if ( ! $( e.target ).closest( 'div' ).hasClass( 'ab-sub-wrapper' ) ) {
+                                        // We're dealing with an already-touch-opened menu genericon (we know el.hasClass('hover')),
+                                        // so close it and prevent propag and defaults. See #29906
+                                        e.stopPropagation();
+                                        e.preventDefault();
+                                        el.removeClass('hover');
                                 }
 
                                 if ( unbind ) {
@@ -124 +130 @@
                 });
 
                 $('#wpadminbar').click( function(e) {
-                        if ( e.target.id != 'wpadminbar' && e.target.id != 'wp-admin-bar-top-secondary' )
+                        if ( e.target.id != 'wpadminbar' && e.target.id != 'wp-admin-bar-top-secondary' ) {
                                 return;
+                        } else {
+                                adminbar.find( 'li.menupop.hover' ).removeClass( 'hover' );
+                                return;
+                        }
 
                         e.preventDefault();
                         $('html, body').animate({ scrollTop: 0 }, 'fast');