Switch attributes to use img attributes and not add data attributes

WordPress · Jun 1, 2017 · 30e366b · 30e366b
1 parent 70550fc
commit 30e366b
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/blocks/library/gallery/gallery-image.js b/blocks/library/gallery/gallery-image.js
@@ -2,7 +2,7 @@
 export default class GalleryImage extends wp.element.Component {
 	render() {
 		return (
-			<div key={ this.props.i } className="blocks-gallery-image" data-url={ this.props.img.url } data-alt={ this.props.img.alt }>
+			<div key={ this.props.i } className="blocks-gallery-image">
 				<img src={ this.props.img.url } alt={ this.props.img.alt } />
 			</div>
 		);

diff --git a/blocks/library/gallery/index.js b/blocks/library/gallery/index.js
@@ -58,9 +58,9 @@ registerBlock( 'core/gallery', {
 
 	attributes: {
 		images:
-			query( 'div.blocks-gallery div.blocks-gallery-image', {
-				url: attr( 'data-url' ),
-				alt: attr( 'data-alt' ),
+			query( 'div.blocks-gallery div.blocks-gallery-image img', {
+				url: attr( 'src' ),
+				alt: attr( 'alt' ),
 			} ),
 	},
 

diff --git a/blocks/test/fixtures/core-gallery.html b/blocks/test/fixtures/core-gallery.html
@@ -1,10 +1,10 @@
 <!-- wp:core/gallery -->
 <div class="blocks-gallery">
 	<div class="blocks-gallery-image">
-		<img src="https://cldup.com/uuUqE_dXzy.jpg" alt="title"/>
+		<img src="https://cldup.com/uuUqE_dXzy.jpg" alt="title" />
 	</div>
 	<div class="blocks-gallery-image">
-		<img src="https://cldup.com/uuUqE_dXzy.jpg" alt="title"/>
+		<img src="https://cldup.com/uuUqE_dXzy.jpg" alt="title" />
 	</div>
 </div>
 <!-- /wp:core/gallery -->
diff --git a/blocks/test/fixtures/core-gallery.json b/blocks/test/fixtures/core-gallery.json
@@ -4,8 +4,8 @@
         "blockType": "core/gallery",
         "attributes": {
             "images": [
-                {},
-                {}
+                { "url": "https://cldup.com/uuUqE_dXzy.jpg", "alt": "title" },
+                { "url": "https://cldup.com/uuUqE_dXzy.jpg", "alt": "title" }
             ]
         }
     }

diff --git a/blocks/test/fixtures/core-gallery.serialized.html b/blocks/test/fixtures/core-gallery.serialized.html
@@ -1,7 +1,7 @@
 <!-- wp:core/gallery -->
 <div class="blocks-gallery alignnone">
-    <div class="blocks-gallery-image"><img/></div>
-    <div class="blocks-gallery-image"><img/></div>
+    <div class="blocks-gallery-image"><img src="https://cldup.com/uuUqE_dXzy.jpg" alt="title" /></div>
+    <div class="blocks-gallery-image"><img src="https://cldup.com/uuUqE_dXzy.jpg" alt="title" /></div>
 </div>
 <!-- /wp:core/gallery -->