Skip to content

Commit eb3c379

Browse files
committed
Customizer: Allow custom accordion items with obsolete structure.
In [59224], customizer accordion item HTML structure was changed to include a button element as the interactive control. However, some themes inject custom markup for panel headings. Fix controls.js to handle both the new markup and the old markup, which is relatively common in themes. Reviewed by jorbin. Merges [59555] to the 6.7 branch. Props paullb, desrosj, sabernhardt, joedolson, jorbin. Fixes #62494. git-svn-id: https://develop.svn.wordpress.org/branches/6.7@59758 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 2a37cf0 commit eb3c379

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/js/_enqueues/wp/customize/controls.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1530,7 +1530,7 @@
15301530
}
15311531

15321532
// Expand/Collapse accordion sections on click.
1533-
section.container.find( '.accordion-section-title button, .customize-section-back' ).on( 'click keydown', function( event ) {
1533+
section.container.find( '.accordion-section-title button, .customize-section-back, .accordion-section-title[tabindex]' ).on( 'click keydown', function( event ) {
15341534
if ( api.utils.isKeydownButNotEnterEvent( event ) ) {
15351535
return;
15361536
}
@@ -1605,7 +1605,7 @@
16051605
content = section.contentContainer,
16061606
overlay = section.headContainer.closest( '.wp-full-overlay' ),
16071607
backBtn = content.find( '.customize-section-back' ),
1608-
sectionTitle = section.headContainer.find( '.accordion-section-title button' ).first(),
1608+
sectionTitle = section.headContainer.find( '.accordion-section-title button, .accordion-section-title[tabindex]' ).first(),
16091609
expand, panel;
16101610

16111611
if ( expanded && ! content.hasClass( 'open' ) ) {
@@ -2694,7 +2694,7 @@
26942694
container = section.headContainer.closest( '.wp-full-overlay-sidebar-content' ),
26952695
content = section.contentContainer,
26962696
backBtn = content.find( '.customize-section-back' ),
2697-
sectionTitle = section.headContainer.find( '.accordion-section-title button' ).first(),
2697+
sectionTitle = section.headContainer.find( '.accordion-section-title button, .accordion-section-title[tabindex]' ).first(),
26982698
body = $( document.body ),
26992699
expand, panel;
27002700

@@ -2833,7 +2833,7 @@
28332833
var meta, panel = this;
28342834

28352835
// Expand/Collapse accordion sections on click.
2836-
panel.headContainer.find( '.accordion-section-title button' ).on( 'click keydown', function( event ) {
2836+
panel.headContainer.find( '.accordion-section-title button, .accordion-section-title[tabindex]' ).on( 'click keydown', function( event ) {
28372837
if ( api.utils.isKeydownButNotEnterEvent( event ) ) {
28382838
return;
28392839
}
@@ -2937,7 +2937,7 @@
29372937
accordionSection = panel.contentContainer,
29382938
overlay = accordionSection.closest( '.wp-full-overlay' ),
29392939
container = accordionSection.closest( '.wp-full-overlay-sidebar-content' ),
2940-
topPanel = panel.headContainer.find( '.accordion-section-title button' ),
2940+
topPanel = panel.headContainer.find( '.accordion-section-title button, .accordion-section-title[tabindex]' ),
29412941
backBtn = accordionSection.find( '.customize-panel-back' ),
29422942
childSections = panel.sections(),
29432943
skipTransition;

0 commit comments

Comments
 (0)