<!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>[53911] trunk/src: Permalinks: Fix aria-live text when removing custom structure.</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/53911">53911</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/53911","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>2022-08-19 20:58:34 +0000 (Fri, 19 Aug 2022)</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'>Permalinks: Fix aria-live text when removing custom structure.
Change the notification announced when a custom structure is removed. Previously, the notification incorrectly indicated that the structure was added for both actions. This changes the notification to correctly announce removals when structures are removed.
Props joedolson, kebbet, SergeyBiryukov.
Fixes <a href="https://core.trac.wordpress.org/ticket/56230">#56230</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcjs_enqueuesadmincommonjs">trunk/src/js/_enqueues/admin/common.js</a></li>
<li><a href="#trunksrcwpadminoptionspermalinkphp">trunk/src/wp-admin/options-permalink.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcjs_enqueuesadmincommonjs"></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/admin/common.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/admin/common.js 2022-08-19 19:46:22 UTC (rev 53910)
+++ trunk/src/js/_enqueues/admin/common.js 2022-08-19 20:58:34 UTC (rev 53911)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -751,9 +751,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> selectionStart = $permalinkStructure[ 0 ].selectionStart,
</span><span class="cx" style="display: block; padding: 0 10px"> selectionEnd = $permalinkStructure[ 0 ].selectionEnd,
</span><span class="cx" style="display: block; padding: 0 10px"> textToAppend = $( this ).text().trim(),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- textToAnnounce = $( this ).attr( 'data-added' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ textToAnnounce,
</ins><span class="cx" style="display: block; padding: 0 10px"> newSelectionStart;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $( this ).hasClass( 'active' ) ) {
+ textToAnnounce = $( this ).attr( 'data-removed' );
+ } else {
+ textToAnnounce = $( this ).attr( 'data-added' );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Remove structure tag if already part of the structure.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( -1 !== permalinkStructureValue.indexOf( textToAppend ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> permalinkStructureValue = permalinkStructureValue.replace( textToAppend + '/', '' );
</span></span></pre></div>
<a id="trunksrcwpadminoptionspermalinkphp"></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/options-permalink.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options-permalink.php 2022-08-19 19:46:22 UTC (rev 53910)
+++ trunk/src/wp-admin/options-permalink.php 2022-08-19 20:58:34 UTC (rev 53911)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -309,8 +309,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Permalink structure tag. */
</span><span class="cx" style="display: block; padding: 0 10px"> $tag_added = __( '%s added to permalink structure' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: Permalink structure tag. */
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$tag_removed = __( '%s removed from permalink structure' );
+/* translators: %s: Permalink structure tag. */
</ins><span class="cx" style="display: block; padding: 0 10px"> $tag_already_used = __( '%s (already used in permalink structure)' );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <h2 class="title"><?php _e( 'Common Settings' ); ?></h2>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -378,6 +379,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> class="button button-secondary"
</span><span class="cx" style="display: block; padding: 0 10px"> aria-label="<?php echo esc_attr( sprintf( $explanation, $tag ) ); ?>"
</span><span class="cx" style="display: block; padding: 0 10px"> data-added="<?php echo esc_attr( sprintf( $tag_added, $tag ) ); ?>"
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ data-removed="<?php echo esc_attr( sprintf( $tag_removed, $tag ) ); ?>"
</ins><span class="cx" style="display: block; padding: 0 10px"> data-used="<?php echo esc_attr( sprintf( $tag_already_used, $tag ) ); ?>">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php echo '%' . $tag . '%'; ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </button>
</span></span></pre>
</div>
</div>
</body>
</html>