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

Update/tinymce single/mock ups
WordPress · Mar 14, 2017 · dd3607e · dd3607e
2 parents 81d108d + 94e87cd
commit dd3607e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/tinymce-single/tinymce/block.css b/tinymce-single/tinymce/block.css
@@ -385,4 +385,5 @@ div.mce-inline-toolbar-grp.block-toolbar > div.mce-stack-layout {
 	content: attr(data-wp-placeholder);
 	position: absolute;
 	opacity: 0.5;
+	pointer-events: none;
 }
diff --git a/tinymce-single/tinymce/block.js b/tinymce-single/tinymce/block.js
@@ -207,12 +207,14 @@
 
 		editor.on( 'keyup', function( event ) {
 			if ( event.keyCode === tinymce.util.VK.BACKSPACE ) {
-				var $empty = editor.$( editor.selection.getNode() ).find( ':empty' );
+				var block = getSelectedBlock();
 
-				$empty.append( '<br>' );
+				if ( ! block.textContent ) {
+					var p = editor.$( '<p><br></p>' );
 
-				if ( $empty.length ) {
-					editor.selection.setCursorLocation( $empty[0], 0 );
+					editor.$( block ).before( p );
+					editor.selection.setCursorLocation( p[0], 0 );
+					editor.$( block ).remove();
 				}
 			}
 		} );