<!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>[38520] trunk/src: Accessibility: Improve the Customizer and Theme Installer initial focus.</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/38520">38520</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/38520","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>afercia</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-09-04 21:50:22 +0000 (Sun, 04 Sep 2016)</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'>Accessibility: Improve the Customizer and Theme Installer initial focus.
The Customizer and Theme Installer open in full overlays that need to receive
focus. Also, keyboard navigation should be constrained within the overlays. Using
CSS `visibility` to hide all the content except the overlays, makes them the only
available and focusable content and allows browsers to handle focus natively.
See <a href="https://core.trac.wordpress.org/ticket/29158">#29158</a>.
Fixes <a href="https://core.trac.wordpress.org/ticket/33228">#33228</a>, <a href="https://core.trac.wordpress.org/ticket/27705">#27705</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincssthemescss">trunk/src/wp-admin/css/themes.css</a></li>
<li><a href="#trunksrcwpadminjscustomizecontrolsjs">trunk/src/wp-admin/js/customize-controls.js</a></li>
<li><a href="#trunksrcwpadminjsthemejs">trunk/src/wp-admin/js/theme.js</a></li>
<li><a href="#trunksrcwpincludesjscustomizeloaderjs">trunk/src/wp-includes/js/customize-loader.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincssthemescss"></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/themes.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/themes.css 2016-09-04 04:08:11 UTC (rev 38519)
+++ trunk/src/wp-admin/css/themes.css 2016-09-04 21:50:22 UTC (rev 38520)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1182,6 +1182,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> body.full-overlay-active {
</span><span class="cx" style="display: block; padding: 0 10px"> overflow: hidden;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* Hide all the content, the Customizer overlay is then made visible to be the only available content. */
+ visibility: hidden;
</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"> .wp-full-overlay {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1613,8 +1615,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> height: 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">-.customize-active #customize-container {
- display: block;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/* Make the Customizer and Theme installer overlays the only available content. */
+#customize-container,
+.theme-install-overlay {
+ visibility: visible;
</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"> .customize-loading #customize-container iframe {
</span></span></pre></div>
<a id="trunksrcwpadminjscustomizecontrolsjs"></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/customize-controls.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/customize-controls.js 2016-09-04 04:08:11 UTC (rev 38519)
+++ trunk/src/wp-admin/js/customize-controls.js 2016-09-04 21:50:22 UTC (rev 38520)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3620,7 +3620,7 @@
</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">- var parent, topFocus,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var parent,
</ins><span class="cx" style="display: block; padding: 0 10px"> body = $( document.body ),
</span><span class="cx" style="display: block; padding: 0 10px"> overlay = body.children( '.wp-full-overlay' ),
</span><span class="cx" style="display: block; padding: 0 10px"> title = $( '#customize-info .panel-title.site-title' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4234,14 +4234,6 @@
</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"> api.trigger( 'ready' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- // Make sure left column gets focus
- topFocus = closeBtn;
- topFocus.focus();
- setTimeout(function () {
- topFocus.focus();
- }, 200);
-
</del><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"> })( wp, jQuery );
</span></span></pre></div>
<a id="trunksrcwpadminjsthemejs"></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/theme.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/theme.js 2016-09-04 04:08:11 UTC (rev 38519)
+++ trunk/src/wp-admin/js/theme.js 2016-09-04 21:50:22 UTC (rev 38520)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -866,9 +866,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> html: themes.template( 'theme-preview' ),
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> render: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- var self = this, currentPreviewDevice,
- data = this.model.toJSON();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ var self = this,
+ currentPreviewDevice,
+ data = this.model.toJSON(),
+ $body = $( document.body );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $body.attr( 'aria-busy', 'true' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> this.$el.removeClass( 'iframe-ready' ).html( this.html( data ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> currentPreviewDevice = this.$el.data( 'current-preview-device' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -879,8 +883,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> themes.router.navigate( themes.router.baseUrl( themes.router.themePath + this.model.get( 'id' ) ), { replace: true } );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> this.$el.fadeIn( 200, function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $( 'body' ).addClass( 'theme-installer-active full-overlay-active' );
- $( '.close-full-overlay' ).focus();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $body.addClass( 'theme-installer-active full-overlay-active' );
</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"> this.$el.find( 'iframe' ).one( 'load', function() {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -890,6 +893,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> iframeLoaded: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> this.$el.addClass( 'iframe-ready' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( document.body ).attr( 'aria-busy', 'false' );
</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() {
</span></span></pre></div>
<a id="trunksrcwpincludesjscustomizeloaderjs"></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/customize-loader.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/js/customize-loader.js 2016-09-04 04:08:11 UTC (rev 38519)
+++ trunk/src/wp-includes/js/customize-loader.js 2016-09-04 21:50:22 UTC (rev 38520)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -183,11 +183,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Callback after the Customizer has been opened.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> opened: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- Loader.body.addClass( 'customize-active full-overlay-active' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ Loader.body.addClass( 'customize-active full-overlay-active' ).attr( 'aria-busy', 'true' );
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Close the Customizer overlay and return focus to the link that opened it.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Close the Customizer overlay.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> close: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! this.active ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -209,11 +209,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( this.originalDocumentTitle ) {
</span><span class="cx" style="display: block; padding: 0 10px"> document.title = this.originalDocumentTitle;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- // Return focus to link that was originally clicked.
- if ( this.link ) {
- this.link.focus();
- }
</del><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">@@ -227,13 +222,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> Loader.saved = null;
</span><span class="cx" style="display: block; padding: 0 10px"> Loader.body.removeClass( 'customize-active full-overlay-active' ).removeClass( 'customize-loading' );
</span><span class="cx" style="display: block; padding: 0 10px"> $( window ).off( 'beforeunload', Loader.beforeunload );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Return focus to the link that opened the Customizer overlay after
+ * the body element visibility is restored.
+ */
+ if ( Loader.link ) {
+ Loader.link.focus();
+ }
</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="cx" style="display: block; padding: 0 10px"> * Callback for the `load` event on the Customizer iframe.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> loaded: function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- Loader.body.removeClass('customize-loading');
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ Loader.body.removeClass( 'customize-loading' ).attr( 'aria-busy', 'false' );
</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></pre>
</div>
</div>
</body>
</html>