<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[33056] trunk/src: Toolbar: Allow submenus to be closed with a second tap on touch devices.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/33056">33056</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/33056","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>helen</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-07-03 03:28:15 +0000 (Fri, 03 Jul 2015)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Toolbar: Allow submenus to be closed with a second tap on touch devices.
Also closes submenus when the admin menu is toggled open, as it opens below and thus can be obscured.
props stephdau, seanchayes.
see <a href="https://core.trac.wordpress.org/ticket/29906">#29906</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincssadminmenucss">trunk/src/wp-admin/css/admin-menu.css</a></li>
<li><a href="#trunksrcwpadminjscommonjs">trunk/src/wp-admin/js/common.js</a></li>
<li><a href="#trunksrcwpincludescssadminbarcss">trunk/src/wp-includes/css/admin-bar.css</a></li>
<li><a href="#trunksrcwpincludesjsadminbarjs">trunk/src/wp-includes/js/admin-bar.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincssadminmenucss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/admin-menu.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/admin-menu.css 2015-07-03 03:25:07 UTC (rev 33055)
+++ trunk/src/wp-admin/css/admin-menu.css 2015-07-03 03:28:15 UTC (rev 33056)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -920,6 +920,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> -moz-box-sizing: border-box;
</span><span class="cx" style="display: block; padding: 0 10px"> box-sizing: border-box;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ .wp-responsive-open #wpadminbar #wp-admin-bar-menu-toggle .ab-icon:before {
+ color: #00b9eb;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* Smartphone */
</span></span></pre></div>
<a id="trunksrcwpadminjscommonjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/common.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/common.js 2015-07-03 03:25:07 UTC (rev 33055)
+++ trunk/src/wp-admin/js/common.js 2015-07-03 03:28:15 UTC (rev 33056)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -752,6 +752,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Toggle sidebar when toggle is clicked
</span><span class="cx" style="display: block; padding: 0 10px"> $( '#wp-admin-bar-menu-toggle' ).on( 'click.wp-responsive', function( event ) {
</span><span class="cx" style="display: block; padding: 0 10px"> event.preventDefault();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // close any open toolbar submenus
+ $adminbar.find( '.hover' ).removeClass( 'hover' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $wpwrap.toggleClass( 'wp-responsive-open' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $wpwrap.hasClass( 'wp-responsive-open' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $(this).find('a').attr( 'aria-expanded', 'true' );
</span></span></pre></div>
<a id="trunksrcwpincludescssadminbarcss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/css/admin-bar.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/css/admin-bar.css 2015-07-03 03:25:07 UTC (rev 33055)
+++ trunk/src/wp-includes/css/admin-bar.css 2015-07-03 03:28:15 UTC (rev 33056)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -207,17 +207,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> right: 100%;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-#wpadminbar .ab-top-menu > li > .ab-item:focus,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#wpadminbar:not(.mobile) .ab-top-menu > li > .ab-item:focus,
</ins><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar.nojq .quicklinks .ab-top-menu > li > .ab-item:focus,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-#wpadminbar .ab-top-menu > li:hover > .ab-item,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#wpadminbar:not(.mobile) .ab-top-menu > li:hover > .ab-item,
</ins><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar .ab-top-menu > li.hover > .ab-item {
</span><span class="cx" style="display: block; padding: 0 10px"> background: #32373c;
</span><span class="cx" style="display: block; padding: 0 10px"> color: #00b9eb;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-#wpadminbar > #wp-toolbar li:hover span.ab-label,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#wpadminbar:not(.mobile) > #wp-toolbar li:hover span.ab-label,
</ins><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar > #wp-toolbar li.hover span.ab-label,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-#wpadminbar > #wp-toolbar a:focus span.ab-label {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#wpadminbar:not(.mobile) > #wp-toolbar a:focus span.ab-label {
</ins><span class="cx" style="display: block; padding: 0 10px"> color: #00b9eb;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -287,6 +287,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> color: #00b9eb;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#wpadminbar.mobile .quicklinks .ab-icon:before,
+#wpadminbar.mobile .quicklinks .ab-item:before {
+ color: #b4b9be;
+}
+
+#wpadminbar.mobile .quicklinks .hover .ab-icon:before,
+#wpadminbar.mobile .quicklinks .hover .ab-item:before {
+ color: #00b9eb;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar .menupop .menupop > .ab-item:before,
</span><span class="cx" style="display: block; padding: 0 10px"> #wpadminbar .ab-top-secondary .menupop .menupop > .ab-item:before {
</span><span class="cx" style="display: block; padding: 0 10px"> position: absolute;
</span></span></pre></div>
<a id="trunksrcwpincludesjsadminbarjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/js/admin-bar.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/admin-bar.js 2015-07-03 03:25:07 UTC (rev 33055)
+++ trunk/src/wp-includes/js/admin-bar.js 2015-07-03 03:28:15 UTC (rev 33056)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -28,6 +28,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> e.stopPropagation();
</span><span class="cx" style="display: block; padding: 0 10px"> e.preventDefault();
</span><span class="cx" style="display: block; padding: 0 10px"> el.addClass('hover');
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } 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 on a second tap and prevent propag and defaults. See #29906
+ e.stopPropagation();
+ e.preventDefault();
+ el.removeClass('hover');
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( unbind ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -124,8 +130,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $('#wpadminbar').click( function(e) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( e.target.id != 'wpadminbar' && e.target.id != 'wp-admin-bar-top-secondary' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( e.target.id != 'wpadminbar' && e.target.id != 'wp-admin-bar-top-secondary' ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ } else {
+ adminbar.find( 'li.menupop.hover' ).removeClass( 'hover' );
+ e.stopPropagation();
+ return;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> e.preventDefault();
</span><span class="cx" style="display: block; padding: 0 10px"> $('html, body').animate({ scrollTop: 0 }, 'fast');
</span></span></pre>
</div>
</div>
</body>
</html>