-
Notifications
You must be signed in to change notification settings - Fork 384
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3728 from ampproject/fix/2146-erroneous-attributes
Validate height, width & layout attributes; fix cover block with video background
- Loading branch information
Showing
20 changed files
with
1,050 additions
and
62 deletions.
There are no files selected for viewing
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
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| <?php | ||
| /** | ||
| * Class AMP_Layout_Sanitizer | ||
| * | ||
| * @since 1.5.0 | ||
| * @package AMP | ||
| */ | ||
|
|
||
| /** | ||
| * Class AMP_Layout_Sanitizer | ||
| * | ||
| * @since 1.5.0 | ||
| */ | ||
| class AMP_Layout_Sanitizer extends AMP_Base_Sanitizer { | ||
| use AMP_Noscript_Fallback; | ||
|
|
||
| /** | ||
| * Sanitize any element that has the `layout` or `data-amp-layout` attribute. | ||
| */ | ||
| public function sanitize() { | ||
| $xpath = new DOMXPath( $this->dom ); | ||
|
|
||
| // Elements with the `layout` attribute will be validated by `AMP_Tag_And_Attribute_Sanitizer`. | ||
| $nodes = $xpath->query( '//*[ not( @layout ) and ( @data-amp-layout or @width or @height or @style ) ]' ); | ||
|
|
||
| foreach ( $nodes as $node ) { | ||
| /** | ||
| * Element. | ||
| * | ||
| * @var DOMElement $node | ||
| */ | ||
|
|
||
| // Layout does not apply inside of noscript. | ||
| if ( $this->is_inside_amp_noscript( $node ) ) { | ||
| continue; | ||
| } | ||
|
|
||
| $width = $node->getAttribute( 'width' ); | ||
| $height = $node->getAttribute( 'height' ); | ||
| $style = $node->getAttribute( 'style' ); | ||
|
|
||
| // The `layout` attribute can also be defined through the `data-amp-layout` attribute. | ||
| if ( $node->hasAttribute( 'data-amp-layout' ) ) { | ||
| $layout = $node->getAttribute( 'data-amp-layout' ); | ||
| $node->setAttribute( 'layout', $layout ); | ||
| $node->removeAttribute( 'data-amp-layout' ); | ||
| } | ||
|
|
||
| if ( ! $this->is_empty_attribute_value( $style ) ) { | ||
| $styles = $this->parse_style_string( $style ); | ||
|
|
||
| /* | ||
| * If both height & width descriptors are 100%, or | ||
| * width attribute is 100% and height style descriptor is 100%, or | ||
| * height attribute is 100% and width style descriptor is 100% | ||
| * then apply fill layout. | ||
| */ | ||
| if ( | ||
| ( | ||
| isset( $styles['width'], $styles['height'] ) && | ||
| ( '100%' === $styles['width'] && '100%' === $styles['height'] ) | ||
| ) || | ||
| ( | ||
| ( ! $this->is_empty_attribute_value( $width ) && '100%' === $width ) && | ||
| ( isset( $styles['height'] ) && '100%' === $styles['height'] ) | ||
| ) || | ||
| ( | ||
| ( ! $this->is_empty_attribute_value( $height ) && '100%' === $height ) && | ||
| ( isset( $styles['width'] ) && '100%' === $styles['width'] ) | ||
| ) | ||
| ) { | ||
| unset( $styles['width'], $styles['height'] ); | ||
| $node->removeAttribute( 'width' ); | ||
| $node->removeAttribute( 'height' ); | ||
|
|
||
| if ( empty( $styles ) ) { | ||
| $node->removeAttribute( 'style' ); | ||
| } else { | ||
| $node->setAttribute( 'style', $this->reassemble_style_string( $styles ) ); | ||
| } | ||
|
|
||
| $this->set_layout_fill( $node ); | ||
| continue; | ||
| } | ||
| } | ||
|
|
||
| // If the width & height are `100%` then apply fill layout. | ||
| if ( '100%' === $width && '100%' === $height ) { | ||
| $this->set_layout_fill( $node ); | ||
| continue; | ||
| } | ||
|
|
||
| // If the width is `100%`, convert the layout to `fixed-height` and width to `auto`. | ||
| if ( '100%' === $width ) { | ||
| $node->setAttribute( 'width', 'auto' ); | ||
| $node->setAttribute( 'layout', AMP_Rule_Spec::LAYOUT_FIXED_HEIGHT ); | ||
| } | ||
| } | ||
|
|
||
| $this->did_convert_elements = true; | ||
| } | ||
|
|
||
| /** | ||
| * Apply the `fill` layout. | ||
| * | ||
| * @param DOMElement $node Node. | ||
| */ | ||
| private function set_layout_fill( DOMElement $node ) { | ||
| if ( $node->hasAttribute( 'width' ) && $node->hasAttribute( 'height' ) ) { | ||
| $node->removeAttribute( 'width' ); | ||
| $node->removeAttribute( 'height' ); | ||
| } | ||
|
|
||
| if ( AMP_Rule_Spec::LAYOUT_FILL !== $node->getAttribute( 'layout' ) ) { | ||
| $node->setAttribute( 'layout', AMP_Rule_Spec::LAYOUT_FILL ); | ||
| } | ||
| } | ||
| } |
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
Oops, something went wrong.