Fix handling of gallery carousels in paragraphs and fix no-JS fallbacks #4009
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Don't worry about reviewing this until the new year!! |
kienstra
approved these changes
Jan 6, 2020
There was a problem hiding this comment.
Approved
Hi @westonruter,
Sorry for the delay. This looks good for both the Gallery block and [gallery] shortcode.
I should have considered the <amp-carousel> being wrapped in a <p> when working on this.
Before: <amp-carousel> wrapped in <p>
After
| * @param DOMElement $element Element. | ||
| * @return bool If it is an image. | ||
| */ | ||
| private function is_image_element( DOMElement $element ) { |
There was a problem hiding this comment.
Good idea to extract this into a helper method.
| $slide_node->setAttribute( 'layout', 'fill' ); | ||
| $slide_node->setAttribute( 'object-fit', 'cover' ); | ||
| } elseif ( isset( $slide_node->firstChild->tagName ) && 'amp-img' === $slide_node->firstChild->tagName ) { | ||
| } elseif ( $slide_node->firstChild instanceof DOMElement && $this->is_image_element( $slide_node->firstChild ) ) { |
There was a problem hiding this comment.
Good idea to change this to instanceof DOMElement
|
Testing Steps
|
|
Verified in QA |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
I found that when a gallery carousel is displayed inside of a paragraph (that is, an
<amp-carousel>inside of a<p>), it completely breaks because the use of<div>inside of the<amp-carousel>causes it to break out the<p>(since block level elements can't appear inside of paragraphs).Given this gallery on a non-AMP page:
Where the underlying
post_contentis:The expected rendered gallery is:
But the actual gallery appears as:
By looking at the DOM tree, the issue of the slide divs breaking out of the
amp-carouselcan be clearly seen:After the fix in this PR, the DOM appears properly nested:
No-JS Fallbacks
Additionally, I also found that when JS is turned off in the browser, the carousel images do not display at all. This is because the gallery embed handler was creating an
amp-img, when it should have been creating animgso that the image sanitizer would create the necessaryamp-imgwith thenoscript > imgfallback content.Before:
After:
Amends #3659. See #3658.
Checklist