<!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>[35313] trunk/src/wp-admin/js/common.js: Administration: the current admin menu item should have an `aria-haspopup` attribute when the menu is folded.</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/35313">35313</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/35313","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>wonderboymusic</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2015-10-21 03:40:38 +0000 (Wed, 21 Oct 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'>Administration: the current admin menu item should have an `aria-haspopup` attribute when the menu is folded.
Unify the jQuery selector caching for `window`, `document`, and `body`.
Props afercia.
Fixes <a href="https://core.trac.wordpress.org/ticket/32578">#32578</a>.</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 2015-10-21 03:27:54 UTC (rev 35312)
+++ trunk/src/wp-admin/js/common.js 2015-10-21 03:40:38 UTC (rev 35313)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,6 +1,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /* global setUserSetting, ajaxurl, commonL10n, alert, confirm, pagenow */
</span><span class="cx" style="display: block; padding: 0 10px"> var showNotice, adminMenu, columns, validateForm, screenMeta;
</span><span class="cx" style="display: block; padding: 0 10px"> ( function( $, window, undefined ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var $document = $( document ),
+ $window = $( window ),
+ $body = $( document.body );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Removed in 3.3.
</span><span class="cx" style="display: block; padding: 0 10px"> // (perhaps) needed for back-compat
</span><span class="cx" style="display: block; padding: 0 10px"> adminMenu = {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,7 +74,7 @@
</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">-$(document).ready(function(){columns.init();});
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$document.ready(function(){columns.init();});
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> validateForm = function( form ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return !$( form )
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -133,7 +137,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> button.addClass( 'screen-meta-active' ).attr( 'aria-expanded', true );
</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">- $( document ).trigger( 'screen:options:open' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $document.trigger( 'screen:options:open' );
</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"> close: function( panel, button ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -143,7 +147,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> panel.parent().hide();
</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">- $( document ).trigger( 'screen:options:close' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $document.trigger( 'screen:options:close' );
</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">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -171,7 +175,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> panel.addClass('active').show();
</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">-$(document).ready( function() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$document.ready( function() {
</ins><span class="cx" style="display: block; padding: 0 10px"> var checks, first, last, checked, sliced, mobileEvent, transitionTimeout, focusedRowActions,
</span><span class="cx" style="display: block; padding: 0 10px"> lastClicked = false,
</span><span class="cx" style="display: block; padding: 0 10px"> pageInput = $('input.current-page'),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -179,9 +183,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> isIOS = /iPhone|iPad|iPod/.test( navigator.userAgent ),
</span><span class="cx" style="display: block; padding: 0 10px"> isAndroid = navigator.userAgent.indexOf( 'Android' ) !== -1,
</span><span class="cx" style="display: block; padding: 0 10px"> isIE8 = $( document.documentElement ).hasClass( 'ie8' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $document = $( document ),
- $window = $( window ),
- $body = $( document.body ),
</del><span class="cx" style="display: block; padding: 0 10px"> $adminMenuWrap = $( '#adminmenuwrap' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $wpwrap = $( '#wpwrap' ),
</span><span class="cx" style="display: block; padding: 0 10px"> $adminmenu = $( '#adminmenu' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -210,7 +211,7 @@
</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"> $('#collapse-menu').on('click.collapse-menu', function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var body = $( document.body ), respWidth, state;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var respWidth, state;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // reset any compensation for submenus near the bottom of the screen
</span><span class="cx" style="display: block; padding: 0 10px"> $('#adminmenu div.wp-submenu').css('margin-top', '');
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -224,31 +225,54 @@
</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"> if ( respWidth && respWidth < 960 ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( body.hasClass('auto-fold') ) {
- body.removeClass('auto-fold').removeClass('folded');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $body.hasClass('auto-fold') ) {
+ $body.removeClass('auto-fold').removeClass('folded');
</ins><span class="cx" style="display: block; padding: 0 10px"> setUserSetting('unfold', 1);
</span><span class="cx" style="display: block; padding: 0 10px"> setUserSetting('mfold', 'o');
</span><span class="cx" style="display: block; padding: 0 10px"> state = 'open';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- body.addClass('auto-fold');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $body.addClass('auto-fold');
</ins><span class="cx" style="display: block; padding: 0 10px"> setUserSetting('unfold', 0);
</span><span class="cx" style="display: block; padding: 0 10px"> state = 'folded';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( body.hasClass('folded') ) {
- body.removeClass('folded');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $body.hasClass('folded') ) {
+ $body.removeClass('folded');
</ins><span class="cx" style="display: block; padding: 0 10px"> setUserSetting('mfold', 'o');
</span><span class="cx" style="display: block; padding: 0 10px"> state = 'open';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- body.addClass('folded');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $body.addClass('folded');
</ins><span class="cx" style="display: block; padding: 0 10px"> setUserSetting('mfold', 'f');
</span><span class="cx" style="display: block; padding: 0 10px"> state = 'folded';
</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">- $( document ).trigger( 'wp-collapse-menu', { state: state } );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ currentMenuItemHasPopup();
+ $document.trigger( 'wp-collapse-menu', { state: state } );
</ins><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">+ // Handle the `aria-haspopup` attribute on the current menu item when it has a sub-menu.
+ function currentMenuItemHasPopup() {
+ var respWidth,
+ $current = $( 'a.wp-has-current-submenu' );
+
+ if ( window.innerWidth ) {
+ respWidth = Math.max( window.innerWidth, document.documentElement.clientWidth );
+ } else {
+ respWidth = 961;
+ }
+
+ if ( $body.hasClass( 'folded' ) || ( $body.hasClass( 'auto-fold' ) && respWidth && respWidth <= 960 && respWidth > 782 ) ) {
+ // When folded or auto-folded and not responsive view, the current menu item does have a fly-out sub-menu.
+ $current.attr( 'aria-haspopup', 'true' );
+ } else {
+ // When expanded or in responsive view, reset aria-haspopup.
+ $current.attr( 'aria-haspopup', 'false' );
+ }
+ };
+
+ $document.on( 'wp-window-resized wp-responsive-activate wp-responsive-deactivate', currentMenuItemHasPopup );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Ensure an admin submenu is within the visual viewport.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -289,7 +313,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> mobileEvent = isIOS ? 'touchstart' : 'click';
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $(document.body).on( mobileEvent+'.wp-mobile-hover', function(e) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $body.on( mobileEvent+'.wp-mobile-hover', function(e) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $adminmenu.data('wp-responsive') ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -866,6 +890,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> window.wpResponsive.init();
</span><span class="cx" style="display: block; padding: 0 10px"> setPinMenu();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ currentMenuItemHasPopup();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $document.on( 'wp-pin-menu wp-window-resized.pin-menu postboxes-columnchange.pin-menu postbox-toggled.pin-menu wp-collapse-menu.pin-menu wp-scroll-start.pin-menu', setPinMenu );
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -875,7 +900,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var timeout;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function triggerEvent() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $(document).trigger( 'wp-window-resized' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $document.trigger( 'wp-window-resized' );
</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"> function fireOnce() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -883,7 +908,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> timeout = window.setTimeout( triggerEvent, 200 );
</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">- $(window).on( 'resize.wp-fire-once', fireOnce );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $window.on( 'resize.wp-fire-once', fireOnce );
</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"> // Make Windows 8 devices play along nicely.
</span></span></pre>
</div>
</div>
</body>
</html>