Skip to content

Commit 106593c

Browse files
committed
Bundled Theme: Pin a theme.json schema version to Twenty Twenty-Five.
Each theme’s theme.json schema version should be pinned to the version that was valid at the time it was released. This means all JSON files in the theme should be pinned to the appropriate schema version, not just theme.json. Reviewed by jorbin. Merges [59448] and [59451] to the 6.7 branch. Props im3dabasia1, poena, mukesh27, desrosj. Fixes #62455. git-svn-id: https://develop.svn.wordpress.org/branches/6.7@59546 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 7f9f8a0 commit 106593c

34 files changed

+38
-38
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;

src/wp-content/themes/twentytwentyfive/styles/01-evening.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://schemas.wp.org/trunk/theme.json",
2+
"$schema": "https://schemas.wp.org/wp/6.7/theme.json",
33
"version": 3,
44
"title": "Evening",
55
"settings": {

src/wp-content/themes/twentytwentyfive/styles/02-noon.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://schemas.wp.org/trunk/theme.json",
2+
"$schema": "https://schemas.wp.org/wp/6.7/theme.json",
33
"version": 3,
44
"title": "Noon",
55
"settings": {

src/wp-content/themes/twentytwentyfive/styles/03-dusk.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://schemas.wp.org/trunk/theme.json",
2+
"$schema": "https://schemas.wp.org/wp/6.7/theme.json",
33
"version": 3,
44
"title": "Dusk",
55
"settings": {

src/wp-content/themes/twentytwentyfive/styles/04-afternoon.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://schemas.wp.org/trunk/theme.json",
2+
"$schema": "https://schemas.wp.org/wp/6.7/theme.json",
33
"version": 3,
44
"title": "Afternoon",
55
"settings": {

src/wp-content/themes/twentytwentyfive/styles/05-twilight.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://schemas.wp.org/trunk/theme.json",
2+
"$schema": "https://schemas.wp.org/wp/6.7/theme.json",
33
"version": 3,
44
"title": "Twilight",
55
"settings": {

src/wp-content/themes/twentytwentyfive/styles/06-morning.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://schemas.wp.org/trunk/theme.json",
2+
"$schema": "https://schemas.wp.org/wp/6.7/theme.json",
33
"version": 3,
44
"title": "Morning",
55
"settings": {

src/wp-content/themes/twentytwentyfive/styles/07-sunrise.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://schemas.wp.org/trunk/theme.json",
2+
"$schema": "https://schemas.wp.org/wp/6.7/theme.json",
33
"version": 3,
44
"title": "Sunrise",
55
"settings": {

src/wp-content/themes/twentytwentyfive/styles/08-midnight.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://schemas.wp.org/trunk/theme.json",
2+
"$schema": "https://schemas.wp.org/wp/6.7/theme.json",
33
"version": 3,
44
"title": "Midnight",
55
"settings": {

src/wp-content/themes/twentytwentyfive/styles/blocks/01-display.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"$schema": "https://schemas.wp.org/trunk/theme.json",
2+
"$schema": "https://schemas.wp.org/wp/6.7/theme.json",
33
"version": 3,
44
"title": "Display",
55
"slug": "text-display",

0 commit comments

Comments
 (0)