<!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>[59225] trunk/src: Revisions: Improve accessibility of revisions selection.</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 { white-space: pre-line; 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/59225">59225</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/59225","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>joedolson</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-10-13 20:47:12 +0000 (Sun, 13 Oct 2024)</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'>Revisions: Improve accessibility of revisions selection.
Add `aria-labelledby` and `aria-describedby` attributes to revision slider selection handle. Add keyboard `:focus` state to revision slider handle. Move 'multiple revision' checkbox before the buttons panel, matching its visual order. Change diff `Title` and `Content` headings from `h3` to `h2` to correct headings hierarchy.
Props joedolson, rishishah, sarahricker, williamalexander, afercia.
Fixes <a href="https://core.trac.wordpress.org/ticket/52303">#52303</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcjs_enqueueswprevisionsjs">trunk/src/js/_enqueues/wp/revisions.js</a></li>
<li><a href="#trunksrcwpadmincssrevisionscss">trunk/src/wp-admin/css/revisions.css</a></li>
<li><a href="#trunksrcwpadminincludesrevisionphp">trunk/src/wp-admin/includes/revision.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcjs_enqueueswprevisionsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/js/_enqueues/wp/revisions.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/wp/revisions.js 2024-10-13 19:07:06 UTC (rev 59224)
+++ trunk/src/js/_enqueues/wp/revisions.js 2024-10-13 20:47:12 UTC (rev 59225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -595,13 +595,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> initialize: function() {
</span><span class="cx" style="display: block; padding: 0 10px"> _.bindAll( this, 'setWidth' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Add the button view.
- this.views.add( new revisions.view.Buttons({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add the checkbox view.
+ this.views.add( new revisions.view.Checkbox({
</ins><span class="cx" style="display: block; padding: 0 10px"> model: this.model
</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">- // Add the checkbox view.
- this.views.add( new revisions.view.Checkbox({
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add the button view.
+ this.views.add( new revisions.view.Buttons({
</ins><span class="cx" style="display: block; padding: 0 10px"> model: this.model
</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">@@ -628,6 +628,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> model: tooltip
</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">+ // Add the visually hidden slider help view.
+ this.views.add( new revisions.view.SliderHelp() );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Add the slider view.
</span><span class="cx" style="display: block; padding: 0 10px"> this.views.add( new revisions.view.Slider({
</span><span class="cx" style="display: block; padding: 0 10px"> model: slider
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -804,6 +807,12 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // The slider visually hidden help view.
+ revisions.view.SliderHelp = wp.Backbone.View.extend({
+ className: 'revisions-slider-hidden-help',
+ template: wp.template( 'revisions-slider-hidden-help' )
+ });
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // The tooltip view.
</span><span class="cx" style="display: block; padding: 0 10px"> // Encapsulates the tooltip.
</span><span class="cx" style="display: block; padding: 0 10px"> revisions.view.Tooltip = wp.Backbone.View.extend({
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -957,6 +966,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> this.applySliderSettings();
</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">+ accessibilityHelper: function() {
+ var handles = $( '.ui-slider-handle' );
+ handles.first().attr( {
+ role: 'button',
+ 'aria-labelledby': 'diff-title-from diff-title-author',
+ 'aria-describedby': 'revisions-slider-hidden-help',
+ } );
+ handles.last().attr( {
+ role: 'button',
+ 'aria-labelledby': 'diff-title-to diff-title-author',
+ 'aria-describedby': 'revisions-slider-hidden-help',
+ } );
+ },
+
</ins><span class="cx" style="display: block; padding: 0 10px"> mouseMove: function( e ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var zoneCount = this.model.revisions.length - 1, // One fewer zone than models.
</span><span class="cx" style="display: block; padding: 0 10px"> sliderFrom = this.$el.allOffsets()[this.direction], // "From" edge of slider.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -996,9 +1019,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> handles.last()
</span><span class="cx" style="display: block; padding: 0 10px"> .toggleClass( 'from-handle', !! isRtl )
</span><span class="cx" style="display: block; padding: 0 10px"> .toggleClass( 'to-handle', ! isRtl );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.accessibilityHelper();
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> handles.removeClass('from-handle to-handle');
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ this.accessibilityHelper();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</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"> start: function( event, ui ) {
</span></span></pre></div>
<a id="trunksrcwpadmincssrevisionscss"></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/revisions.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/revisions.css 2024-10-13 19:07:06 UTC (rev 59224)
+++ trunk/src/wp-admin/css/revisions.css 2024-10-13 20:47:12 UTC (rev 59225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -458,8 +458,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> touch-action: none;
</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">-.wp-slider .ui-slider-handle,
-.wp-slider .ui-slider-handle.focus {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.wp-slider .ui-slider-handle {
</ins><span class="cx" style="display: block; padding: 0 10px"> background: #f6f7f7;
</span><span class="cx" style="display: block; padding: 0 10px"> border: 1px solid #c3c4c7;
</span><span class="cx" style="display: block; padding: 0 10px"> box-shadow: 0 1px 0 #c3c4c7;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -479,6 +478,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> transform: translateY(1px);
</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">+.wp-slider .ui-slider-handle:focus,
+.wp-slider .ui-slider-handle.ui-state-focus {
+ background: #f0f0f1;
+ border-color: #8c8f94;
+ box-shadow: 0 0 0 2px #2271b1;
+ /* Only visible in Windows High Contrast mode */
+ outline: 2px solid transparent;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .wp-slider .ui-slider-handle:before {
</span><span class="cx" style="display: block; padding: 0 10px"> background: none;
</span><span class="cx" style="display: block; padding: 0 10px"> position: absolute;
</span></span></pre></div>
<a id="trunksrcwpadminincludesrevisionphp"></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/includes/revision.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/revision.php 2024-10-13 19:07:06 UTC (rev 59224)
+++ trunk/src/wp-admin/includes/revision.php 2024-10-13 20:47:12 UTC (rev 59225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -378,6 +378,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <script id="tmpl-revisions-slider-hidden-help" type="text/html">
+ <h2 class="screen-reader-text"><?php esc_html_e( 'Select a revision' ); ?></h2>
+ <p id="revisions-slider-hidden-help" hidden><?php esc_html_e( 'Change revision by using the left and arrow keys' ); ?></p>
+ </script>
+
</ins><span class="cx" style="display: block; padding: 0 10px"> <script id="tmpl-revisions-checkbox" type="text/html">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="revision-toggle-compare-mode">
</span><span class="cx" style="display: block; padding: 0 10px"> <label>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -397,13 +402,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( ! _.isUndefined( data.attributes ) ) { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="diff-title">
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( 'from' === data.type ) { #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <strong><?php _ex( 'From:', 'Followed by post revision info' ); ?></strong>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <strong id="diff-title-from"><?php _ex( 'From:', 'Followed by post revision info' ); ?></strong>
</ins><span class="cx" style="display: block; padding: 0 10px"> <# } else if ( 'to' === data.type ) { #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <strong><?php _ex( 'To:', 'Followed by post revision info' ); ?></strong>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <strong id="diff-title-to"><?php _ex( 'To:', 'Followed by post revision info' ); ?></strong>
</ins><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="author-card<# if ( data.attributes.autosave ) { #> autosave<# } #>">
</span><span class="cx" style="display: block; padding: 0 10px"> {{{ data.attributes.author.avatar }}}
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="author-info">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="author-info" id="diff-title-author">
</ins><span class="cx" style="display: block; padding: 0 10px"> <# if ( data.attributes.autosave ) { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="byline">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -464,7 +469,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="diff-error"><?php _e( 'Sorry, something went wrong. The requested comparison could not be loaded.' ); ?></div>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="diff">
</span><span class="cx" style="display: block; padding: 0 10px"> <# _.each( data.fields, function( field ) { #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h3>{{ field.name }}</h3>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h2>{{ field.name }}</h2>
</ins><span class="cx" style="display: block; padding: 0 10px"> {{{ field.diff }}}
</span><span class="cx" style="display: block; padding: 0 10px"> <# }); #>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span></span></pre>
</div>
</div>
</body>
</html>