Update serializer to use void block if no children exist for block

WordPress · Jun 12, 2017 · 127aecb · 127aecb
1 parent af617a2
commit 127aecb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/blocks/api/serializer.js b/blocks/api/serializer.js
@@ -82,17 +82,19 @@ export default function serialize( blocks ) {
 			indent_inner_html: true,
 			wrap_line_length: 0,
 		};
+		const blockAttributes = getCommentAttributes( block.attributes, parseBlockAttributes( saveContent, blockType ) );
+
+		if ( ! saveContent ) {
+			return memo + '<!-- wp:' + blockName + ' ' + blockAttributes + '/-->\n\n';
+		}
 
 		return memo + (
 			'<!-- wp:' +
 			blockName +
 			' ' +
-			getCommentAttributes(
-				block.attributes,
-				parseBlockAttributes( saveContent, blockType )
-			) +
+			blockAttributes +
 			'-->' +
-			( saveContent ? '\n' + beautifyHtml( saveContent, beautifyOptions ) + '\n' : '' ) +
+			'\n' + beautifyHtml( saveContent, beautifyOptions ) + '\n' +
 			'<!-- /wp:' +
 			blockName +
 			' -->'

diff --git a/blocks/test/fixtures/core-latestposts.html b/blocks/test/fixtures/core-latestposts.html
@@ -1,2 +1,2 @@
-<!-- wp:core/latestposts poststoshow="5" --><!-- /wp:core/latestposts -->
+<!-- wp:core/latestposts poststoshow="5" /-->
 
diff --git a/blocks/test/fixtures/core-latestposts.serialized.html b/blocks/test/fixtures/core-latestposts.serialized.html
@@ -1,2 +1,2 @@
-<!-- wp:core/latestposts poststoshow="5" --><!-- /wp:core/latestposts -->
+<!-- wp:core/latestposts poststoshow="5" /-->
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1,2 @@
		<!-- wp:core/latestposts poststoshow="5" --><!-- /wp:core/latestposts -->
		<!-- wp:core/latestposts poststoshow="5" /-->