<!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>[29770] trunk/src/wp-admin/js/common.js: Fix tapping on the menu in iOS and Android, fixes #29365 for trunk</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/29770">29770</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/29770","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>azaozz</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-09-26 23:01:52 +0000 (Fri, 26 Sep 2014)</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'>Fix tapping on the menu in iOS and Android, fixes <a href="https://core.trac.wordpress.org/ticket/29365">#29365</a> for trunk</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminjscommonjs">trunk/src/wp-admin/js/common.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 2014-09-26 20:53:12 UTC (rev 29769)
+++ trunk/src/wp-admin/js/common.js 2014-09-26 23:01:52 UTC (rev 29770)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -175,7 +175,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> lastClicked = false,
</span><span class="cx" style="display: block; padding: 0 10px"> menu = $('#adminmenu'),
</span><span class="cx" style="display: block; padding: 0 10px"> pageInput = $('input.current-page'),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- currentPage = pageInput.val();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ currentPage = pageInput.val(),
+ isIOS = /iPhone|iPad|iPod/.test( navigator.userAgent ),
+ isAndroid = navigator.userAgent.indexOf( 'Android' ) !== -1;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // when the menu is folded, make the fly-out submenu header clickable
</span><span class="cx" style="display: block; padding: 0 10px"> menu.on('click.wp-submenu-head', '.wp-submenu-head', function(e){
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -224,7 +226,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'ontouchstart' in window || /IEMobile\/[1-9]/.test(navigator.userAgent) ) { // touch screen device
</span><span class="cx" style="display: block; padding: 0 10px"> // iOS Safari works with touchstart, the rest work with click
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- mobileEvent = /Mobile\/.+Safari/.test(navigator.userAgent) ? 'touchstart' : 'click';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ mobileEvent = isIOS ? 'touchstart' : 'click';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // close any open submenus when touch/click is not on the menu
</span><span class="cx" style="display: block; padding: 0 10px"> $(document.body).on( mobileEvent+'.wp-mobile-hover', function(e) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -282,74 +284,76 @@
</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">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- menu.find('li.wp-has-submenu').hoverIntent({
- over: function() {
- var b, h, o, f, m = $(this).find('.wp-submenu'), menutop, wintop, maxtop, top = parseInt( m.css('top'), 10 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! isIOS && ! isAndroid ) {
+ menu.find('li.wp-has-submenu').hoverIntent({
+ over: function() {
+ var b, h, o, f, m = $(this).find('.wp-submenu'), menutop, wintop, maxtop, top = parseInt( m.css('top'), 10 );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isNaN(top) || top > -5 ) { // meaning the submenu is visible
- return;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isNaN(top) || top > -5 ) { // meaning the submenu is visible
+ return;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( menu.data('wp-responsive') ) {
- // The menu is in responsive mode, bail
- return;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( menu.data('wp-responsive') ) {
+ // The menu is in responsive mode, bail
+ return;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- menutop = $(this).offset().top;
- wintop = $(window).scrollTop();
- maxtop = menutop - wintop - 30; // max = make the top of the sub almost touch admin bar
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ menutop = $(this).offset().top;
+ wintop = $(window).scrollTop();
+ maxtop = menutop - wintop - 30; // max = make the top of the sub almost touch admin bar
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- b = menutop + m.height() + 1; // Bottom offset of the menu
- h = $('#wpwrap').height(); // Height of the entire page
- o = 60 + b - h;
- f = $(window).height() + wintop - 15; // The fold
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ b = menutop + m.height() + 1; // Bottom offset of the menu
+ h = $('#wpwrap').height(); // Height of the entire page
+ o = 60 + b - h;
+ f = $(window).height() + wintop - 15; // The fold
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( f < (b - o) ) {
- o = b - f;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( f < (b - o) ) {
+ o = b - f;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( o > maxtop ) {
- o = maxtop;
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( o > maxtop ) {
+ o = maxtop;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( o > 1 ) {
- m.css('margin-top', '-'+o+'px');
- } else {
- m.css('margin-top', '');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( o > 1 ) {
+ m.css('margin-top', '-'+o+'px');
+ } else {
+ m.css('margin-top', '');
+ }
+
+ menu.find('li.menu-top').removeClass('opensub');
+ $(this).addClass('opensub');
+ },
+ out: function(){
+ if ( menu.data('wp-responsive') ) {
+ // The menu is in responsive mode, bail
+ return;
+ }
+
+ $(this).removeClass('opensub').find('.wp-submenu').css('margin-top', '');
+ },
+ timeout: 200,
+ sensitivity: 7,
+ interval: 90
+ });
+
+ menu.on('focus.adminmenu', '.wp-submenu a', function(e){
+ if ( menu.data('wp-responsive') ) {
+ // The menu is in responsive mode, bail
+ return;
</ins><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">- menu.find('li.menu-top').removeClass('opensub');
- $(this).addClass('opensub');
- },
- out: function(){
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $(e.target).closest('li.menu-top').addClass('opensub');
+ }).on('blur.adminmenu', '.wp-submenu a', function(e){
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( menu.data('wp-responsive') ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // The menu is in responsive mode, bail
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</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">- $(this).removeClass('opensub').find('.wp-submenu').css('margin-top', '');
- },
- timeout: 200,
- sensitivity: 7,
- interval: 90
- });
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $(e.target).closest('li.menu-top').removeClass('opensub');
+ });
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- menu.on('focus.adminmenu', '.wp-submenu a', function(e){
- if ( menu.data('wp-responsive') ) {
- // The menu is in responsive mode, bail
- return;
- }
-
- $(e.target).closest('li.menu-top').addClass('opensub');
- }).on('blur.adminmenu', '.wp-submenu a', function(e){
- if ( menu.data('wp-responsive') ) {
- // The menu is in responsive mode, bail
- return;
- }
-
- $(e.target).closest('li.menu-top').removeClass('opensub');
- });
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Move .updated and .error alert boxes. Don't move boxes designed to be inline.
</span><span class="cx" style="display: block; padding: 0 10px"> $('div.wrap h2:first').nextAll('div.updated, div.error').addClass('below-h2');
</span><span class="cx" style="display: block; padding: 0 10px"> $('div.updated, div.error').not('.below-h2, .inline').insertAfter( $('div.wrap h2:first') );
</span></span></pre>
</div>
</div>
</body>
</html>