<!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>[59224] trunk: Administration: A11y: Fix accordion 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/59224">59224</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/59224","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 19:07:06 +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'>Administration: A11y: Fix accordion accessibility.
Change accordions in the customizer and the navigation menus to make proper usage of accordion markup patterns. This includes adding missing `:focus` states, using a `button` element to control tabbing and interaction, instead of the heading elements, and removing instructional text for screen reader users that was used to compensate for the incorrect markup pattern.
Props afercia, rishishah, kushang78, rcreators, krupajnanda, hmbashar, joedolson.
Fixes <a href="https://core.trac.wordpress.org/ticket/42002">#42002</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcjs_enqueueslibaccordionjs">trunk/src/js/_enqueues/lib/accordion.js</a></li>
<li><a href="#trunksrcjs_enqueueswpcustomizecontrolsjs">trunk/src/js/_enqueues/wp/customize/controls.js</a></li>
<li><a href="#trunksrcjs_enqueueswpcustomizenavmenusjs">trunk/src/js/_enqueues/wp/customize/nav-menus.js</a></li>
<li><a href="#trunksrcwpadmincsscommoncss">trunk/src/wp-admin/css/common.css</a></li>
<li><a href="#trunksrcwpadmincsscustomizecontrolscss">trunk/src/wp-admin/css/customize-controls.css</a></li>
<li><a href="#trunksrcwpadmincsscustomizenavmenuscss">trunk/src/wp-admin/css/customize-nav-menus.css</a></li>
<li><a href="#trunksrcwpadminincludestemplatephp">trunk/src/wp-admin/includes/template.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizenavmenusphp">trunk/src/wp-includes/class-wp-customize-nav-menus.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizepanelphp">trunk/src/wp-includes/class-wp-customize-panel.php</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizesectionphp">trunk/src/wp-includes/class-wp-customize-section.php</a></li>
<li><a href="#trunksrcwpincludescustomizeclasswpcustomizethemespanelphp">trunk/src/wp-includes/customize/class-wp-customize-themes-panel.php</a></li>
<li><a href="#trunktestsphpunittestscustomizenavmenusphp">trunk/tests/phpunit/tests/customize/nav-menus.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcjs_enqueueslibaccordionjs"></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/lib/accordion.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/lib/accordion.js 2024-10-13 18:47:27 UTC (rev 59223)
+++ trunk/src/js/_enqueues/lib/accordion.js 2024-10-13 19:07:06 UTC (rev 59224)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,18 +7,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * <div class="accordion-container">
</span><span class="cx" style="display: block; padding: 0 10px"> * <div class="accordion-section open">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * <h3 class="accordion-section-title"></h3>
- * <div class="accordion-section-content">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * <h3 class="accordion-section-title"><button type="button" aria-expanded="true" aria-controls="target-1"></button></h3>
+ * <div class="accordion-section-content" id="target">
</ins><span class="cx" style="display: block; padding: 0 10px"> * </div>
</span><span class="cx" style="display: block; padding: 0 10px"> * </div>
</span><span class="cx" style="display: block; padding: 0 10px"> * <div class="accordion-section">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * <h3 class="accordion-section-title"></h3>
- * <div class="accordion-section-content">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * <h3 class="accordion-section-title"><button type="button" aria-expanded="false" aria-controls="target-2"></button></h3>
+ * <div class="accordion-section-content" id="target-2">
</ins><span class="cx" style="display: block; padding: 0 10px"> * </div>
</span><span class="cx" style="display: block; padding: 0 10px"> * </div>
</span><span class="cx" style="display: block; padding: 0 10px"> * <div class="accordion-section">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * <h3 class="accordion-section-title"></h3>
- * <div class="accordion-section-content">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * <h3 class="accordion-section-title"><button type="button" aria-expanded="false" aria-controls="target-3"></button></h3>
+ * <div class="accordion-section-content" id="target-3">
</ins><span class="cx" style="display: block; padding: 0 10px"> * </div>
</span><span class="cx" style="display: block; padding: 0 10px"> * </div>
</span><span class="cx" style="display: block; padding: 0 10px"> * </div>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -34,13 +34,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $( function () {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Expand/Collapse accordion sections on click.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $( '.accordion-container' ).on( 'click keydown', '.accordion-section-title', function( e ) {
- if ( e.type === 'keydown' && 13 !== e.which ) { // "Return" key.
- return;
- }
-
- e.preventDefault(); // Keep this AFTER the key filter above.
-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $( '.accordion-container' ).on( 'click', '.accordion-section-title button', function() {
</ins><span class="cx" style="display: block; padding: 0 10px"> accordionSwitch( $( this ) );
</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">@@ -54,7 +48,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function accordionSwitch ( el ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var section = el.closest( '.accordion-section' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- sectionToggleControl = section.find( '[aria-expanded]' ).first(),
</del><span class="cx" style="display: block; padding: 0 10px"> container = section.closest( '.accordion-container' ),
</span><span class="cx" style="display: block; padding: 0 10px"> siblings = container.find( '.open' ),
</span><span class="cx" style="display: block; padding: 0 10px"> siblingsToggleControl = siblings.find( '[aria-expanded]' ).first(),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,8 +79,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }, 150);
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // If there's an element with an aria-expanded attribute, assume it's a toggle control and toggle the aria-expanded value.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( sectionToggleControl ) {
- sectionToggleControl.attr( 'aria-expanded', String( sectionToggleControl.attr( 'aria-expanded' ) === 'false' ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( el ) {
+ el.attr( 'aria-expanded', String( el.attr( 'aria-expanded' ) === '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>
<a id="trunksrcjs_enqueueswpcustomizecontrolsjs"></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/customize/controls.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/wp/customize/controls.js 2024-10-13 18:47:27 UTC (rev 59223)
+++ trunk/src/js/_enqueues/wp/customize/controls.js 2024-10-13 19:07:06 UTC (rev 59224)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1530,7 +1530,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"> // Expand/Collapse accordion sections on click.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- section.container.find( '.accordion-section-title, .customize-section-back' ).on( 'click keydown', function( event ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ section.container.find( '.accordion-section-title button, .customize-section-back' ).on( 'click keydown', function( event ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( api.utils.isKeydownButNotEnterEvent( event ) ) {
</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">@@ -1605,7 +1605,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> content = section.contentContainer,
</span><span class="cx" style="display: block; padding: 0 10px"> overlay = section.headContainer.closest( '.wp-full-overlay' ),
</span><span class="cx" style="display: block; padding: 0 10px"> backBtn = content.find( '.customize-section-back' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- sectionTitle = section.headContainer.find( '.accordion-section-title' ).first(),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sectionTitle = section.headContainer.find( '.accordion-section-title button' ).first(),
</ins><span class="cx" style="display: block; padding: 0 10px"> expand, panel;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( expanded && ! content.hasClass( 'open' ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1615,9 +1615,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> expand = function() {
</span><span class="cx" style="display: block; padding: 0 10px"> section._animateChangeExpanded( function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- sectionTitle.attr( 'tabindex', '-1' );
- backBtn.attr( 'tabindex', '0' );
-
</del><span class="cx" style="display: block; padding: 0 10px"> backBtn.trigger( 'focus' );
</span><span class="cx" style="display: block; padding: 0 10px"> content.css( 'top', '' );
</span><span class="cx" style="display: block; padding: 0 10px"> container.scrollTop( 0 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1663,8 +1660,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"> section._animateChangeExpanded( function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- backBtn.attr( 'tabindex', '-1' );
- sectionTitle.attr( 'tabindex', '0' );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> sectionTitle.trigger( 'focus' );
</span><span class="cx" style="display: block; padding: 0 10px"> content.css( 'top', '' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2699,7 +2694,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> container = section.headContainer.closest( '.wp-full-overlay-sidebar-content' ),
</span><span class="cx" style="display: block; padding: 0 10px"> content = section.contentContainer,
</span><span class="cx" style="display: block; padding: 0 10px"> backBtn = content.find( '.customize-section-back' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- sectionTitle = section.headContainer.find( '.accordion-section-title' ).first(),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ sectionTitle = section.headContainer.find( '.accordion-section-title button' ).first(),
</ins><span class="cx" style="display: block; padding: 0 10px"> body = $( document.body ),
</span><span class="cx" style="display: block; padding: 0 10px"> expand, panel;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2719,9 +2714,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> expand = function() {
</span><span class="cx" style="display: block; padding: 0 10px"> section._animateChangeExpanded( function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- sectionTitle.attr( 'tabindex', '-1' );
- backBtn.attr( 'tabindex', '0' );
-
</del><span class="cx" style="display: block; padding: 0 10px"> backBtn.trigger( 'focus' );
</span><span class="cx" style="display: block; padding: 0 10px"> content.css( 'top', '' );
</span><span class="cx" style="display: block; padding: 0 10px"> container.scrollTop( 0 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2752,8 +2744,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"> section._animateChangeExpanded( function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- backBtn.attr( 'tabindex', '-1' );
- sectionTitle.attr( 'tabindex', '0' );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> sectionTitle.trigger( 'focus' );
</span><span class="cx" style="display: block; padding: 0 10px"> content.css( 'top', '' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2843,7 +2833,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var meta, panel = this;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Expand/Collapse accordion sections on click.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- panel.headContainer.find( '.accordion-section-title' ).on( 'click keydown', function( event ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ panel.headContainer.find( '.accordion-section-title button' ).on( 'click keydown', function( event ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( api.utils.isKeydownButNotEnterEvent( event ) ) {
</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">@@ -2947,7 +2937,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> accordionSection = panel.contentContainer,
</span><span class="cx" style="display: block; padding: 0 10px"> overlay = accordionSection.closest( '.wp-full-overlay' ),
</span><span class="cx" style="display: block; padding: 0 10px"> container = accordionSection.closest( '.wp-full-overlay-sidebar-content' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- topPanel = panel.headContainer.find( '.accordion-section-title' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ topPanel = panel.headContainer.find( '.accordion-section-title button' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> backBtn = accordionSection.find( '.customize-panel-back' ),
</span><span class="cx" style="display: block; padding: 0 10px"> childSections = panel.sections(),
</span><span class="cx" style="display: block; padding: 0 10px"> skipTransition;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2974,9 +2964,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> panel._animateChangeExpanded( function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- topPanel.attr( 'tabindex', '-1' );
- backBtn.attr( 'tabindex', '0' );
-
</del><span class="cx" style="display: block; padding: 0 10px"> backBtn.trigger( 'focus' );
</span><span class="cx" style="display: block; padding: 0 10px"> accordionSection.css( 'top', '' );
</span><span class="cx" style="display: block; padding: 0 10px"> container.scrollTop( 0 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2996,8 +2983,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> skipTransition = accordionSection.hasClass( 'skip-transition' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! skipTransition ) {
</span><span class="cx" style="display: block; padding: 0 10px"> panel._animateChangeExpanded( function() {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- topPanel.attr( 'tabindex', '0' );
- backBtn.attr( 'tabindex', '-1' );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> topPanel.focus();
</span><span class="cx" style="display: block; padding: 0 10px"> accordionSection.css( 'top', '' );
</span></span></pre></div>
<a id="trunksrcjs_enqueueswpcustomizenavmenusjs"></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/customize/nav-menus.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/js/_enqueues/wp/customize/nav-menus.js 2024-10-13 18:47:27 UTC (rev 59223)
+++ trunk/src/js/_enqueues/wp/customize/nav-menus.js 2024-10-13 19:07:06 UTC (rev 59224)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1107,7 +1107,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> var section = this,
</span><span class="cx" style="display: block; padding: 0 10px"> $title;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $title = section.container.find( '.accordion-section-title:first' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $title = section.container.find( '.accordion-section-title button:first' );
</ins><span class="cx" style="display: block; padding: 0 10px"> $title.find( '.menu-in-location' ).remove();
</span><span class="cx" style="display: block; padding: 0 10px"> _.each( themeLocationSlugs, function( themeLocationSlug ) {
</span><span class="cx" style="display: block; padding: 0 10px"> var $label, locationName;
</span></span></pre></div>
<a id="trunksrcwpadmincsscommoncss"></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/common.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/common.css 2024-10-13 18:47:27 UTC (rev 59223)
+++ trunk/src/wp-admin/css/common.css 2024-10-13 19:07:06 UTC (rev 59224)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2431,10 +2431,44 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* Back-compat for nav-menus screen */
</span><span class="cx" style="display: block; padding: 0 10px"> .nav-menus-php .metabox-holder h3 {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ padding: 0;
+}
+.nav-menus-php .metabox-holder .accordion-section-title button.accordion-trigger {
+ background: inherit;
+ color: #1d2327;
+ display: block;
+ position: relative;
+ text-align: left;
+ width: 100%;
+ outline: none;
+ border: 0;
</ins><span class="cx" style="display: block; padding: 0 10px"> padding: 10px 10px 11px 14px;
</span><span class="cx" style="display: block; padding: 0 10px"> line-height: 1.5;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ cursor: pointer;
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.nav-menus-php .metabox-holder .accordion-section-title button.accordion-trigger:focus {
+ box-shadow: 0 0 0 2px #2271b1;
+ outline: 2px solid transparent;
+}
+.nav-menus-php .metabox-holder .accordion-section-title span.dashicons.dashicons-arrow-down {
+ position: absolute;
+ right: 10px;
+ left: auto;
+ color: #787c82;
+ border-radius: 50px;
+}
+.nav-menus-php .metabox-holder .accordion-section-title:hover span.dashicons.dashicons-arrow-down {
+ color: #1d2327;
+}
+.nav-menus-php .metabox-holder .accordion-section-title span.dashicons.dashicons-arrow-down::before {
+ position: relative;
+ left: -1px
+}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.nav-menus-php .metabox-holder .accordion-section.open .accordion-section-title span.dashicons.dashicons-arrow-down {
+ transform: rotate(180deg);
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> #templateside ul li a {
</span><span class="cx" style="display: block; padding: 0 10px"> text-decoration: none;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3522,9 +3556,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* @todo: can we use a common class for these? */
</span><span class="cx" style="display: block; padding: 0 10px"> .nav-menus-php .item-edit:before,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.widget-top .widget-action .toggle-indicator:before,
-.control-section .accordion-section-title:after,
-.accordion-section-title:after {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.wp-customizer .control-section .accordion-section-title:after,
+.wp-customizer .accordion-section-title:after,
+.widget-top .widget-action .toggle-indicator:before {
</ins><span class="cx" style="display: block; padding: 0 10px"> content: "\f140";
</span><span class="cx" style="display: block; padding: 0 10px"> font: normal 20px/1 dashicons;
</span><span class="cx" style="display: block; padding: 0 10px"> speak: never;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3542,8 +3576,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .handlediv,
</span><span class="cx" style="display: block; padding: 0 10px"> .postbox .handlediv.button-link,
</span><span class="cx" style="display: block; padding: 0 10px"> .item-edit,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.toggle-indicator,
-.accordion-section-title:after {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.toggle-indicator {
</ins><span class="cx" style="display: block; padding: 0 10px"> color: #787c82;
</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">@@ -3559,8 +3592,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .postbox .handlediv.button-link:focus,
</span><span class="cx" style="display: block; padding: 0 10px"> .item-edit:hover,
</span><span class="cx" style="display: block; padding: 0 10px"> .item-edit:focus,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-.sidebar-name:hover .toggle-indicator,
-.accordion-section-title:hover:after {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+.sidebar-name:hover .toggle-indicator {
</ins><span class="cx" style="display: block; padding: 0 10px"> color: #1d2327;
</span><span class="cx" style="display: block; padding: 0 10px"> /* Only visible in Windows High Contrast mode */
</span><span class="cx" style="display: block; padding: 0 10px"> outline: 2px solid transparent;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3572,14 +3604,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> outline: 2px solid transparent;
</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">-.control-section .accordion-section-title:after,
-.accordion-section-title:after {
- float: right;
- right: 20px;
- top: -2px;
-}
-
-.control-section.open .accordion-section-title:after,
</del><span class="cx" style="display: block; padding: 0 10px"> #customize-info.open .accordion-section-title:after,
</span><span class="cx" style="display: block; padding: 0 10px"> .nav-menus-php .menu-item-edit-active .item-edit:before,
</span><span class="cx" style="display: block; padding: 0 10px"> .widget.open .widget-top .widget-action .toggle-indicator:before,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3969,6 +3993,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> padding: 12px;
</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">+ .nav-menus-php .metabox-holder h3 {
+ padding: 0;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> .postbox .handlediv {
</span><span class="cx" style="display: block; padding: 0 10px"> margin-top: 3px;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadmincsscustomizecontrolscss"></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/customize-controls.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/customize-controls.css 2024-10-13 18:47:27 UTC (rev 59223)
+++ trunk/src/wp-admin/css/customize-controls.css 2024-10-13 19:07:06 UTC (rev 59224)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -553,6 +553,23 @@
</span><span class="cx" style="display: block; padding: 0 10px"> .15s border-color ease-in-out;
</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">+.accordion-section-title:has(button.accordion-trigger) {
+ padding: 0;
+}
+
+.accordion-section-title button.accordion-trigger {
+ all: unset;
+ width: 100%;
+ height: 100%;
+ padding: 10px 10px 11px 14px;
+ display: flex;
+ align-items: center;
+}
+
+.accordion-section-title button.accordion-trigger:has(.menu-in-location) {
+ display: block;
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> @media (prefers-reduced-motion: reduce) {
</span><span class="cx" style="display: block; padding: 0 10px"> #customize-theme-controls .accordion-section-title,
</span><span class="cx" style="display: block; padding: 0 10px"> #customize-outer-theme-controls .accordion-section-title {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -579,9 +596,9 @@
</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"> #customize-controls .control-section:hover > .accordion-section-title,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-#customize-controls .control-section .accordion-section-title:hover,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#customize-controls .control-section .accordion-section-title button:hover,
</ins><span class="cx" style="display: block; padding: 0 10px"> #customize-controls .control-section.open .accordion-section-title,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-#customize-controls .control-section .accordion-section-title:focus {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#customize-controls .control-section .accordion-section-title button:focus {
</ins><span class="cx" style="display: block; padding: 0 10px"> color: #2271b1;
</span><span class="cx" style="display: block; padding: 0 10px"> background: #f6f7f7;
</span><span class="cx" style="display: block; padding: 0 10px"> border-left-color: #2271b1;
</span></span></pre></div>
<a id="trunksrcwpadmincsscustomizenavmenuscss"></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/customize-nav-menus.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/customize-nav-menus.css 2024-10-13 18:47:27 UTC (rev 59223)
+++ trunk/src/wp-admin/css/customize-nav-menus.css 2024-10-13 19:07:06 UTC (rev 59224)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -542,8 +542,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> background: transparent;
</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">-#available-menu-items .accordion-section-title button {
- display: block;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+#available-menu-items .accordion-section-title button .toggle-indicator {
+ display: flex;
+ align-items: center;
</ins><span class="cx" style="display: block; padding: 0 10px"> width: 28px;
</span><span class="cx" style="display: block; padding: 0 10px"> height: 35px;
</span><span class="cx" style="display: block; padding: 0 10px"> position: absolute;
</span></span></pre></div>
<a id="trunksrcwpadminincludestemplatephp"></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/template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/template.php 2024-10-13 18:47:27 UTC (rev 59223)
+++ trunk/src/wp-admin/includes/template.php 2024-10-13 19:07:06 UTC (rev 59224)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1566,23 +1566,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ++$i;
</span><span class="cx" style="display: block; padding: 0 10px"> $hidden_class = in_array( $box['id'], $hidden, true ) ? 'hide-if-js' : '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $open_class = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $open_class = '';
+ $aria_expanded = 'false';
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $first_open && empty( $hidden_class ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $first_open = true;
- $open_class = 'open';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $first_open = true;
+ $open_class = 'open';
+ $aria_expanded = '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"> <li class="control-section accordion-section <?php echo $hidden_class; ?> <?php echo $open_class; ?> <?php echo esc_attr( $box['id'] ); ?>" id="<?php echo esc_attr( $box['id'] ); ?>">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h3 class="accordion-section-title hndle" tabindex="0">
- <?php echo esc_html( $box['title'] ); ?>
- <span class="screen-reader-text">
- <?php
- /* translators: Hidden accessibility text. */
- _e( 'Press return or enter to open this section' );
- ?>
- </span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h3 class="accordion-section-title hndle">
+ <button type="button" class="accordion-trigger" aria-expanded="<?php echo $aria_expanded; ?>" aria-controls="<?php echo esc_attr( $box['id'] ); ?>-content">
+ <span class="accordion-title">
+ <?php echo esc_html( $box['title'] ); ?>
+ <span class="dashicons dashicons-arrow-down" aria-hidden="true"></span>
+ </span>
+ </button>
</ins><span class="cx" style="display: block; padding: 0 10px"> </h3>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="accordion-section-content <?php postbox_classes( $box['id'], $page ); ?>">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="accordion-section-content <?php postbox_classes( $box['id'], $page ); ?>" id="<?php echo esc_attr( $box['id'] ); ?>-content">
</ins><span class="cx" style="display: block; padding: 0 10px"> <div class="inside">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php call_user_func( $box['callback'], $data_object, $box ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </div><!-- .inside -->
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizenavmenusphp"></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/class-wp-customize-nav-menus.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-nav-menus.php 2024-10-13 18:47:27 UTC (rev 59223)
+++ trunk/src/wp-includes/class-wp-customize-nav-menus.php 2024-10-13 19:07:06 UTC (rev 59224)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1223,20 +1223,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="<?php echo esc_attr( $id ); ?>" class="accordion-section">
</span><span class="cx" style="display: block; padding: 0 10px"> <h4 class="accordion-section-title" role="presentation">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php echo esc_html( $available_item_type['title'] ); ?>
- <span class="spinner"></span>
- <span class="no-items"><?php _e( 'No items' ); ?></span>
- <button type="button" class="button-link" aria-expanded="false">
- <span class="screen-reader-text">
- <?php
- /* translators: %s: Title of a section with menu items. */
- printf( __( 'Toggle section: %s' ), esc_html( $available_item_type['title'] ) );
- ?>
- </span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <button type="button" class="accordion-trigger" aria-expanded="false" aria-controls="<?php echo esc_attr( $id ); ?>-content">
+ <?php echo esc_html( $available_item_type['title'] ); ?>
+ <span class="spinner"></span>
+ <span class="no-items"><?php _e( 'No items' ); ?></span>
</ins><span class="cx" style="display: block; padding: 0 10px"> <span class="toggle-indicator" aria-hidden="true"></span>
</span><span class="cx" style="display: block; padding: 0 10px"> </button>
</span><span class="cx" style="display: block; padding: 0 10px"> </h4>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="accordion-section-content">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="accordion-section-content" id="<?php echo esc_attr( $id ); ?>-content">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php if ( 'post_type' === $available_item_type['type'] ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php $post_type_obj = get_post_type_object( $available_item_type['object'] ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php if ( current_user_can( $post_type_obj->cap->create_posts ) && current_user_can( $post_type_obj->cap->publish_posts ) ) : ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1264,18 +1258,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <div id="new-custom-menu-item" class="accordion-section">
</span><span class="cx" style="display: block; padding: 0 10px"> <h4 class="accordion-section-title" role="presentation">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php _e( 'Custom Links' ); ?>
- <button type="button" class="button-link" aria-expanded="false">
- <span class="screen-reader-text">
- <?php
- /* translators: Hidden accessibility text. */
- _e( 'Toggle section: Custom Links' );
- ?>
- </span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <button type="button" class="accordion-trigger" aria-expanded="false" aria-controls="new-custom-menu-item-content">
+ <?php _e( 'Custom Links' ); ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <span class="toggle-indicator" aria-hidden="true"></span>
</span><span class="cx" style="display: block; padding: 0 10px"> </button>
</span><span class="cx" style="display: block; padding: 0 10px"> </h4>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <div class="accordion-section-content customlinkdiv">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="accordion-section-content customlinkdiv" id="new-custom-menu-item-content">
</ins><span class="cx" style="display: block; padding: 0 10px"> <input type="hidden" value="custom" id="custom-menu-item-type" name="menu-item[-1][menu-item-type]" />
</span><span class="cx" style="display: block; padding: 0 10px"> <p id="menu-item-url-wrap" class="wp-clearfix">
</span><span class="cx" style="display: block; padding: 0 10px"> <label class="howto" for="custom-menu-item-url"><?php _e( 'URL' ); ?></label>
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizepanelphp"></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/class-wp-customize-panel.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-panel.php 2024-10-13 18:47:27 UTC (rev 59223)
+++ trunk/src/wp-includes/class-wp-customize-panel.php 2024-10-13 19:07:06 UTC (rev 59224)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -346,16 +346,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected function render_template() {
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <li id="accordion-panel-{{ data.id }}" class="accordion-section control-section control-panel control-panel-{{ data.type }}">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h3 class="accordion-section-title" tabindex="0">
- {{ data.title }}
- <span class="screen-reader-text">
- <?php
- /* translators: Hidden accessibility text. */
- _e( 'Press return or enter to open this panel' );
- ?>
- </span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h3 class="accordion-section-title">
+ <button type="button" class="accordion-trigger" aria-expanded="false" aria-controls="{{ data.id }}-content">
+ {{ data.title }}
+ </button>
</ins><span class="cx" style="display: block; padding: 0 10px"> </h3>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <ul class="accordion-sub-container control-panel-content"></ul>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <ul class="accordion-sub-container control-panel-content" id="{{ data.id }}-content"></ul>
</ins><span class="cx" style="display: block; padding: 0 10px"> </li>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizesectionphp"></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/class-wp-customize-section.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-section.php 2024-10-13 18:47:27 UTC (rev 59223)
+++ trunk/src/wp-includes/class-wp-customize-section.php 2024-10-13 19:07:06 UTC (rev 59224)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -355,16 +355,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected function render_template() {
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <li id="accordion-section-{{ data.id }}" class="accordion-section control-section control-section-{{ data.type }}">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <h3 class="accordion-section-title" tabindex="0">
- {{ data.title }}
- <span class="screen-reader-text">
- <?php
- /* translators: Hidden accessibility text. */
- _e( 'Press return or enter to open this section' );
- ?>
- </span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <h3 class="accordion-section-title">
+ <button type="button" class="accordion-trigger" aria-expanded="false" aria-controls="{{ data.id }}-content">
+ {{ data.title }}
+ </button>
</ins><span class="cx" style="display: block; padding: 0 10px"> </h3>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <ul class="accordion-section-content">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <ul class="accordion-section-content" id="{{ data.id }}-content">
</ins><span class="cx" style="display: block; padding: 0 10px"> <li class="customize-section-description-container section-meta <# if ( data.description_hidden ) { #>customize-info<# } #>">
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="customize-section-title">
</span><span class="cx" style="display: block; padding: 0 10px"> <button class="customize-section-back" tabindex="-1">
</span></span></pre></div>
<a id="trunksrcwpincludescustomizeclasswpcustomizethemespanelphp"></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/customize/class-wp-customize-themes-panel.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/customize/class-wp-customize-themes-panel.php 2024-10-13 18:47:27 UTC (rev 59223)
+++ trunk/src/wp-includes/customize/class-wp-customize-themes-panel.php 2024-10-13 19:07:06 UTC (rev 59224)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -44,7 +44,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<span class="customize-action">' . __( 'Previewing theme' ) . '</span> {{ data.title }}';
</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">-
</del><span class="cx" style="display: block; padding: 0 10px"> <?php if ( current_user_can( 'switch_themes' ) ) : ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <button type="button" class="button change-theme" aria-label="<?php esc_attr_e( 'Change theme' ); ?>"><?php _ex( 'Change', 'theme' ); ?></button>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php endif; ?>
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizenavmenusphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/customize/nav-menus.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/nav-menus.php 2024-10-13 18:47:27 UTC (rev 59223)
+++ trunk/tests/phpunit/tests/customize/nav-menus.php 2024-10-13 19:07:06 UTC (rev 59224)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -769,7 +769,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $post_types ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $post_types as $type ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringContainsString( 'available-menu-items-post_type-' . esc_attr( $type->name ), $template );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertMatchesRegularExpression( '#<h4 class="accordion-section-title".*>\s*' . esc_html( $type->labels->name ) . '#', $template );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertMatchesRegularExpression( '#<h4 class="accordion-section-title".*>\s*<button type="button" class="accordion-trigger" aria-expanded="false" aria-controls=".*">\s*' . esc_html( $type->labels->name ) . '#', $template );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringContainsString( 'data-type="post_type"', $template );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringContainsString( 'data-object="' . esc_attr( $type->name ) . '"', $template );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringContainsString( 'data-type_label="' . esc_attr( $type->labels->singular_name ) . '"', $template );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -780,7 +780,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $taxonomies ) {
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $taxonomies as $tax ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringContainsString( 'available-menu-items-taxonomy-' . esc_attr( $tax->name ), $template );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertMatchesRegularExpression( '#<h4 class="accordion-section-title".*>\s*' . esc_html( $tax->labels->name ) . '#', $template );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertMatchesRegularExpression( '#<h4 class="accordion-section-title".*>\s*<button type="button" class="accordion-trigger" aria-expanded="false" aria-controls=".*">\s*' . esc_html( $tax->labels->name ) . '#', $template );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringContainsString( 'data-type="taxonomy"', $template );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringContainsString( 'data-object="' . esc_attr( $tax->name ) . '"', $template );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringContainsString( 'data-type_label="' . esc_attr( $tax->labels->singular_name ) . '"', $template );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -788,7 +788,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"> $this->assertStringContainsString( 'available-menu-items-custom_type', $template );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertMatchesRegularExpression( '#<h4 class="accordion-section-title".*>\s*Custom#', $template );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertMatchesRegularExpression( '#<h4 class="accordion-section-title".*>\s*<button type="button" class="accordion-trigger" aria-expanded="false" aria-controls=".*">\s*Custom#', $template );
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringContainsString( 'data-type="custom_type"', $template );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringContainsString( 'data-object="custom_object"', $template );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertStringContainsString( 'data-type_label="Custom Type"', $template );
</span></span></pre>
</div>
</div>
</body>
</html>