<!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>[26516] trunk/src/wp-admin: Make the responsive menu usable with a mouse, fix non-folded and :focus styles, toggle the submenus on touchend/click.</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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/26516">26516</a></dd>
<dt>Author</dt> <dd>azaozz</dd>
<dt>Date</dt> <dd>2013-12-02 03:18:40 +0000 (Mon, 02 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make the responsive menu usable with a mouse, fix non-folded and :focus styles, toggle the submenus on touchend/click. Fixes <a href="http://core.trac.wordpress.org/ticket/26086">#26086</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincsswpadmincss">trunk/src/wp-admin/css/wp-admin.css</a></li>
<li><a href="#trunksrcwpadminjscommonjs">trunk/src/wp-admin/js/common.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincsswpadmincss"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/css/wp-admin.css (26515 => 26516)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/css/wp-admin.css 2013-12-02 01:50:24 UTC (rev 26515)
+++ trunk/src/wp-admin/css/wp-admin.css 2013-12-02 03:18:40 UTC (rev 26516)
</span><span class="lines">@@ -11823,6 +11823,14 @@
</span><span class="cx"> display: block;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ .auto-fold #adminmenu a.menu-top:focus + .wp-submenu,
+ .auto-fold #adminmenu .wp-has-current-submenu a.menu-top:focus + .wp-submenu {
+ position: relative;
+ left: -1px;
+ right: 0;
+ top: 0;
+ }
+
</ins><span class="cx"> /* Remove submenu headers and adjust sub meu*/
</span><span class="cx"> #adminmenu .wp-submenu .wp-submenu-head {
</span><span class="cx"> display: none;
</span></span></pre></div>
<a id="trunksrcwpadminjscommonjs"></a>
<div class="modfile"><h4>Modified: trunk/src/wp-admin/js/common.js (26515 => 26516)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/wp-admin/js/common.js 2013-12-02 01:50:24 UTC (rev 26515)
+++ trunk/src/wp-admin/js/common.js 2013-12-02 03:18:40 UTC (rev 26516)
</span><span class="lines">@@ -251,6 +251,11 @@
</span><span class="cx"> if ( isNaN(top) || top > -5 ) // meaning the submenu is visible
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ if ( menu.data('wp-responsive') ) {
+ // The menu is in responsive mode, bail
+ return;
+ }
+
</ins><span class="cx"> menutop = $(this).offset().top;
</span><span class="cx"> wintop = $(window).scrollTop();
</span><span class="cx"> maxtop = menutop - wintop - 30; // max = make the top of the sub almost touch admin bar
</span><span class="lines">@@ -275,6 +280,11 @@
</span><span class="cx"> $(this).addClass('opensub');
</span><span class="cx"> },
</span><span class="cx"> out: function(){
</span><ins>+ if ( menu.data('wp-responsive') ) {
+ // The menu is in responsive mode, bail
+ return;
+ }
+
</ins><span class="cx"> $(this).removeClass('opensub').find('.wp-submenu').css('margin-top', '');
</span><span class="cx"> },
</span><span class="cx"> timeout: 200,
</span><span class="lines">@@ -283,8 +293,18 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> menu.on('focus.adminmenu', '.wp-submenu a', function(e){
</span><ins>+ if ( menu.data('wp-responsive') ) {
+ // The menu is in responsive mode, bail
+ return;
+ }
+
</ins><span class="cx"> $(e.target).closest('li.menu-top').addClass('opensub');
</span><span class="cx"> }).on('blur.adminmenu', '.wp-submenu a', function(e){
</span><ins>+ if ( menu.data('wp-responsive') ) {
+ // The menu is in responsive mode, bail
+ return;
+ }
+
</ins><span class="cx"> $(e.target).closest('li.menu-top').removeClass('opensub');
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -541,18 +561,28 @@
</span><span class="cx"> // Add menu events
</span><span class="cx"> $adminmenu.on( 'touchstart.wp-responsive', 'li.wp-has-submenu > a', function() {
</span><span class="cx"> scrollStart = $window.scrollTop();
</span><del>- }).on( 'touchend.wp-responsive', 'li.wp-has-submenu > a', function( event ) {
- if ( ! $adminmenu.data('wp-responsive') || $window.scrollTop() !== scrollStart ) {
</del><ins>+ }).on( 'touchend.wp-responsive click.wp-responsive', 'li.wp-has-submenu > a', function( event ) {
+ if ( ! $adminmenu.data('wp-responsive') ||
+ ( event.type === 'touchend' && $window.scrollTop() !== scrollStart ) ) {
+
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- $( this ).find( 'li.wp-has-submenu' ).removeClass( 'selected' );
- $( this ).parent( 'li' ).addClass( 'selected' );
</del><ins>+ $( this ).parent( 'li' ).toggleClass( 'selected' );
</ins><span class="cx"> event.preventDefault();
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> self.trigger();
</span><span class="cx"> $document.on( 'wp-window-resized.wp-responsive', $.proxy( this.trigger, this ) );
</span><ins>+
+ // This needs to run later as UI Sortable may be initialized later on $(document).ready()
+ $window.on( 'load.wp-responsive', function() {
+ var width = navigator.userAgent.indexOf('AppleWebKit/') > -1 ? $window.width() : window.innerWidth;
+
+ if ( width <= 782 ) {
+ self.disableSortables();
+ }
+ });
</ins><span class="cx"> },
</span><span class="cx">
</span><span class="cx"> activate: function() {
</span></span></pre>
</div>
</div>
</body>
</html>