Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add fallback to old gallery edit and save for existing gallery #28961

Merged
merged 11 commits into from
Feb 15, 2021
Merged

Add fallback to old gallery edit and save for existing gallery #28961

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
32635c3
Add back edit and save methods for v1 content
Feb 11, 2021
fe2d583
Get basic swap out of save and edit working if ids array contains values
Feb 11, 2021
6632e77
fix up columns calculation and broken css
Feb 12, 2021
8b0513f
Add comment to removed deprecation.
Feb 12, 2021
6a744e1
Remove console log
Feb 12, 2021
4116b49
Moved all v1 code to separate dir and revert deprecations
Feb 14, 2021
95efc3d
Fix css and image upload issues
Feb 14, 2021
2aaefd5
Account for first 2 deprecations that didn't have an ids array
Feb 15, 2021
7157e38
Fix linting errors
Feb 15, 2021
321f758
Plumb through experimental flag so new gallery edit and save only loa…
Feb 15, 2021
ce0ac7e
Remove save wrapper as not actually needed.
Feb 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions lib/experiments-page.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,17 @@ function gutenberg_initialize_experiments_settings() {
'id' => 'gutenberg-widgets-in-customizer',
)
);
add_settings_field(
'gutenberg-gallery-refactor',
__( 'Gallery Refactor', 'gutenberg' ),
'gutenberg_display_experiment_field',
'gutenberg-experiments',
'gutenberg_experiments_section',
array(
'label' => __( 'Enable the refactored gallery block', 'gutenberg' ),
'id' => 'gutenberg-gallery-refactor',
)
);
register_setting(
'gutenberg-experiments',
'gutenberg-experiments'
Expand Down
51 changes: 51 additions & 0 deletions packages/block-library/src/gallery/block.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,57 @@
"name": "core/gallery",
"category": "media",
"attributes": {
"images": {
"type": "array",
"default": [],
"source": "query",
"selector": ".blocks-gallery-item",
"query": {
"url": {
"type": "string",
"source": "attribute",
"selector": "img",
"attribute": "src"
},
"fullUrl": {
"type": "string",
"source": "attribute",
"selector": "img",
"attribute": "data-full-url"
},
"link": {
"type": "string",
"source": "attribute",
"selector": "img",
"attribute": "data-link"
},
"alt": {
"type": "string",
"source": "attribute",
"selector": "img",
"attribute": "alt",
"default": ""
},
"id": {
"type": "string",
"source": "attribute",
"selector": "img",
"attribute": "data-id"
},
"caption": {
"type": "string",
"source": "html",
"selector": ".blocks-gallery-item__caption"
}
}
},
"ids": {
"type": "array",
"items": {
"type": "number"
},
"default": []
},
"imageUploads": {
"type": "array",
"default": [],
Expand Down
5 changes: 3 additions & 2 deletions packages/block-library/src/gallery/deprecated.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -834,6 +834,7 @@ const v5 = {
},
};

/* Comment out the v6 migration to allow new gallery format to be tested in tandem with existing
const v6 = {
attributes: {
images: {
Expand Down Expand Up @@ -1013,5 +1014,5 @@ const v6 = {
];
},
};

export default [ v6, v5, v4, v3, v2, v1 ];
*/
export default [ v5, v4, v3, v2, v1 ];
Loading