Merge pull request #268 from WordPress/update/tinymce-single/mock-ups

Fix caption check on deselect
WordPress · Mar 14, 2017 · ca6a726 · ca6a726
2 parents d2b9e82 + a356521
commit ca6a726
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/tinymce-single/blocks/core/blockquote/register.js b/tinymce-single/blocks/core/blockquote/register.js
@@ -37,7 +37,7 @@
 	function onDeselect( block ) {
 		var footer = block.querySelector( 'footer' );
 
-		if ( ! footer.textContent ) {
+		if ( footer && ! footer.textContent ) {
 			block.removeChild( footer );
 		}
 	}

diff --git a/tinymce-single/blocks/core/image/register.js b/tinymce-single/blocks/core/image/register.js
@@ -25,7 +25,7 @@
 	function onDeselect( block ) {
 		var figcaption = block.querySelector( 'figcaption' );
 
-		if ( ! figcaption.textContent ) {
+		if ( figcaption && ! figcaption.textContent ) {
 			block.removeChild( figcaption );
 		}
 	}

diff --git a/tinymce-single/blocks/core/table/register.js b/tinymce-single/blocks/core/table/register.js
@@ -29,7 +29,7 @@
 	function onDeselect( block ) {
 		var figcaption = block.querySelector( 'figcaption' );
 
-		if ( ! figcaption.textContent ) {
+		if ( figcaption && ! figcaption.textContent ) {
 			block.removeChild( figcaption );
 		}
 	}

diff --git a/tinymce-single/blocks/my-awesome-plugin/youtube/register.js b/tinymce-single/blocks/my-awesome-plugin/youtube/register.js
@@ -25,7 +25,7 @@
 	function onDeselect( block ) {
 		var figcaption = block.querySelector( 'figcaption' );
 
-		if ( ! figcaption.textContent ) {
+		if ( figcaption && ! figcaption.textContent ) {
 			block.removeChild( figcaption );
 		}
 	}