<!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>[44767] trunk/src/wp-includes/widgets: Accessibility: Improve the image and gallery widgets preview accessibility.</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/44767">44767</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/44767","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>2019-02-23 18:31:05 +0000 (Sat, 23 Feb 2019)</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 image and gallery widgets preview accessibility.
In an authoring context, the image `alt` attribute purpose is different from the one for the front end. For example, screen reader users need to know what the selected image is, even when the original `alt` value is empty.
This change introduces a new pattern for the `alt` text in an authoring context:
- uses the `alt` text if not empty
- when there's no `alt` text, informs users the image has no alternative text and provides a reference to the image filename
Also, makes the gallery media widget preview an unordered list to make screen readers announce the number of images automatically.
Fixes <a href="https://core.trac.wordpress.org/ticket/43137">#43137</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgetmediagalleryphp">trunk/src/wp-includes/widgets/class-wp-widget-media-gallery.php</a></li>
<li><a href="#trunksrcwpincludeswidgetsclasswpwidgetmediaimagephp">trunk/src/wp-includes/widgets/class-wp-widget-media-image.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludeswidgetsclasswpwidgetmediagalleryphp"></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/widgets/class-wp-widget-media-gallery.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-widget-media-gallery.php 2019-02-21 22:54:01 UTC (rev 44766)
+++ trunk/src/wp-includes/widgets/class-wp-widget-media-gallery.php 2019-02-23 18:31:05 UTC (rev 44767)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -175,7 +175,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> parent::render_control_template_scripts();
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <script type="text/html" id="tmpl-wp-media-widget-gallery-preview">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <# var describedById = 'describedBy-' + String( Math.random() ); #>
</del><span class="cx" style="display: block; padding: 0 10px"> <#
</span><span class="cx" style="display: block; padding: 0 10px"> var ids = _.filter( data.ids, function( id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> return ( id in data.attachments );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -182,27 +181,51 @@
</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 ( ids.length ) { #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="gallery media-widget-gallery-preview">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <ul class="gallery media-widget-gallery-preview" role="list">
</ins><span class="cx" style="display: block; padding: 0 10px"> <# _.each( ids, function( id, index ) { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <# var attachment = data.attachments[ id ]; #>
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( index < 6 ) { #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <dl class="gallery-item">
- <dt class="gallery-icon">
- <# if ( attachment.sizes.thumbnail ) { #>
- <img src="{{ attachment.sizes.thumbnail.url }}" width="{{ attachment.sizes.thumbnail.width }}" height="{{ attachment.sizes.thumbnail.height }}" alt="" />
- <# } else { #>
- <img src="{{ attachment.url }}" alt="" />
- <# } #>
- <# if ( index === 5 && ids.length > 6 ) { #>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <li class="gallery-item">
+ <div class="gallery-icon">
+ <img alt="{{ attachment.alt }}"
+ <# if ( index === 5 && data.ids.length > 6 ) { #> aria-hidden="true" <# } #>
+ <# if ( attachment.sizes.thumbnail ) { #>
+ src="{{ attachment.sizes.thumbnail.url }}" width="{{ attachment.sizes.thumbnail.width }}" height="{{ attachment.sizes.thumbnail.height }}"
+ <# } else { #>
+ src="{{ attachment.url }}"
+ <# } #>
+ <# if ( ! attachment.alt && attachment.filename ) { #>
+ aria-label="
+ <?php
+ echo esc_attr(
+ sprintf(
+ /* translators: %s: the image file name. */
+ __( 'The current image has no alternative text. The file name is: %s' ),
+ '{{ attachment.filename }}'
+ )
+ );
+ ?>
+ "
+ <# } #>
+ />
+ <# if ( index === 5 && data.ids.length > 6 ) { #>
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="gallery-icon-placeholder">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p class="gallery-icon-placeholder-text">+{{ ids.length - 5 }}</p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p class="gallery-icon-placeholder-text" aria-label="
+ <?php
+ printf(
+ /* translators: %s: the amount of additional, not visible images in the gallery widget preview. */
+ __( 'Additional images added to this gallery: %s' ),
+ '{{ data.ids.length - 5 }}'
+ );
+ ?>
+ ">+{{ data.ids.length - 5 }}</p>
</ins><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <# } #>
- </dt>
- </dl>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <# } #>
+ </div>
+ </li>
</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">- </div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ </ul>
</ins><span class="cx" style="display: block; padding: 0 10px"> <# } else { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="attachment-media-view">
</span><span class="cx" style="display: block; padding: 0 10px"> <p class="placeholder"><?php echo esc_html( $this->l10n['no_media_selected'] ); ?></p>
</span></span></pre></div>
<a id="trunksrcwpincludeswidgetsclasswpwidgetmediaimagephp"></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/widgets/class-wp-widget-media-image.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/widgets/class-wp-widget-media-image.php 2019-02-21 22:54:01 UTC (rev 44766)
+++ trunk/src/wp-includes/widgets/class-wp-widget-media-image.php 2019-02-23 18:31:05 UTC (rev 44767)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -339,7 +339,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</span><span class="cx" style="display: block; padding: 0 10px"> <script type="text/html" id="tmpl-wp-media-widget-image-preview">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <# var describedById = 'describedBy-' + String( Math.random() ); #>
</del><span class="cx" style="display: block; padding: 0 10px"> <# if ( data.error && 'missing_attachment' === data.error ) { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="notice notice-error notice-alt notice-missing-attachment">
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php echo $this->l10n['missing_attachment']; ?></p>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -349,15 +348,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p><?php _e( 'Unable to preview media due to an unknown error.' ); ?></p>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <# } else if ( data.url ) { #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <img class="attachment-thumb" src="{{ data.url }}" draggable="false" alt="{{ data.alt }}" <# if ( ! data.alt && data.currentFilename ) { #> aria-describedby="{{ describedById }}" <# } #> />
- <# if ( ! data.alt && data.currentFilename ) { #>
- <p class="hidden" id="{{ describedById }}">
- <?php
- /* translators: %s: image filename */
- echo sprintf( __( 'Current image: %s' ), '{{ data.currentFilename }}' );
- ?>
- </p>
- <# } #>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <img class="attachment-thumb" src="{{ data.url }}" draggable="false" alt="{{ data.alt }}"
+ <# if ( ! data.alt && data.currentFilename ) { #>
+ aria-label="
+ <?php
+ echo esc_attr(
+ sprintf(
+ /* translators: %s: the image file name. */
+ __( 'The current image has no alternative text. The file name is: %s' ),
+ '{{ data.currentFilename }}'
+ )
+ );
+ ?>
+ "
+ <# } #>
+ />
</ins><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span></span></pre>
</div>
</div>
</body>
</html>