within gallery.
+ *
+ * @param DOMElement $element The UL element.
+ */
+ protected function add_lightbox_attributes_to_image_nodes( $element ) {
+ $images = $element->getElementsByTagName( 'amp-img' );
+ $num_images = $images->length;
+ if ( 0 === $num_images ) {
+ return;
+ }
+ $attributes = array(
+ 'data-amp-lightbox' => '',
+ 'on' => 'tap:' . self::AMP_IMAGE_LIGHTBOX_ID,
+ 'role' => 'button',
+ );
+
+ for ( $j = $num_images - 1; $j >= 0; $j-- ) {
+ $image_node = $images->item( $j );
+ foreach ( $attributes as $att => $value ) {
+ $image_node->setAttribute( $att, $value );
+ }
+ }
+ }
+}
diff --git a/includes/sanitizers/class-amp-img-sanitizer.php b/includes/sanitizers/class-amp-img-sanitizer.php
index 5d1bab0f911..121837d97b8 100644
--- a/includes/sanitizers/class-amp-img-sanitizer.php
+++ b/includes/sanitizers/class-amp-img-sanitizer.php
@@ -115,15 +115,6 @@ private function filter_attributes( $attributes ) {
foreach ( $attributes as $name => $value ) {
switch ( $name ) {
- case 'src':
- case 'alt':
- case 'class':
- case 'srcset':
- case 'on':
- case 'attribution':
- $out[ $name ] = $value;
- break;
-
case 'width':
case 'height':
$out[ $name ] = $this->sanitize_dimension( $value, $name );
@@ -138,6 +129,7 @@ private function filter_attributes( $attributes ) {
break;
default:
+ $out[ $name ] = $value;
break;
}
}
@@ -235,6 +227,10 @@ private function adjust_and_replace_node( $node ) {
$layout = isset( $amp_data['layout'] ) ? $amp_data['layout'] : false;
$new_attributes = $this->filter_attachment_layout_attributes( $node, $new_attributes, $layout );
+ if ( isset( $old_attributes['data-amp-lightbox'] ) ) {
+ $this->maybe_add_amp_image_lightbox_node();
+ }
+
$this->add_or_append_attribute( $new_attributes, 'class', 'amp-wp-enforced-sizes' );
if ( empty( $new_attributes['layout'] ) && ! empty( $new_attributes['height'] ) && ! empty( $new_attributes['width'] ) ) {
$new_attributes['layout'] = 'intrinsic';
diff --git a/tests/test-amp-img-sanitizer.php b/tests/test-amp-img-sanitizer.php
index 3b17c344559..ed4f3765f33 100644
--- a/tests/test-amp-img-sanitizer.php
+++ b/tests/test-amp-img-sanitizer.php
@@ -127,11 +127,6 @@ public function get_data() {
'',
),
- 'image_with_blacklisted_attribute' => array(
- '
',
- '',
- ),
-
'image_with_no_dimensions_is_forced' => array(
'',
'',
@@ -183,6 +178,11 @@ public function get_data() {
'This is an example caption.',
'This is an example caption.',
),
+
+ 'image_with_custom_lightbox_attrs' => array(
+ '
',
+ '',
+ ),
);
}
diff --git a/tests/test-class-amp-gallery-block-sanitizer.php b/tests/test-class-amp-gallery-block-sanitizer.php
new file mode 100644
index 00000000000..97831d2e914
--- /dev/null
+++ b/tests/test-class-amp-gallery-block-sanitizer.php
@@ -0,0 +1,69 @@
+ array(
+ 'Lorem Ipsum Demet Delorit.
',
+ 'Lorem Ipsum Demet Delorit.
',
+ ),
+
+ 'no_a_no_amp_img' => array(
+ '',
+ '',
+ ),
+
+ 'no_amp_carousel' => array(
+ '',
+ '',
+ ),
+
+ 'data_amp_with_carousel' => array(
+ '',
+ '',
+ ),
+
+ 'data_amp_with_lightbox' => array(
+ '',
+ '',
+ ),
+
+ 'data_amp_with_lightbox_and_carousel' => array(
+ '',
+ '',
+ ),
+ );
+ }
+
+ /**
+ * Test sanitizer.
+ *
+ * @dataProvider get_data
+ * @param string $source Source.
+ * @param string $expected Expected.
+ */
+ public function test_sanitizer( $source, $expected ) {
+ $dom = AMP_DOM_Utils::get_dom_from_content( $source );
+ $sanitizer = new AMP_Gallery_Block_Sanitizer( $dom, array(
+ 'content_max_width' => 600,
+ ) );
+ $sanitizer->sanitize();
+ $content = AMP_DOM_Utils::get_content_from_dom( $dom );
+ $content = preg_replace( '/(?<=>)\s+(?=<)/', '', $content );
+ $this->assertEquals( $expected, $content );
+ }
+}