Ticket #39437: 39437.patch

src/wp-includes/js/tinymce/plugins/wordpress/plugin.js

@@ -129 +129 @@
                                         '/>';
                                 } );
                         }
+                }
+        });
 
-                        // Remove spaces from empty paragraphs.
-                        // Try to avoid a lot of backtracking, can freeze the editor. See #35890 and #38294.
-                        event.content = event.content.replace( /<p>([^<>]+)<\/p>/gi, function( tag, text ) {
-                                if ( text === '&nbsp;' || ! /\S/.test( text ) ) {
-                                        return '<p><br /></p>';
+        editor.on( 'setcontent', function() {
+                // Remove spaces from empty paragraphs.
+                editor.$( 'p' ).each( function( i, node ) {
+                        if ( node.innerHTML && node.innerHTML.length < 10 ) {
+                                var html = tinymce.trim( node.innerHTML );
+
+                                if ( ! html || html === '&nbsp;' ) {
+                                        node.innerHTML = ( tinymce.Env.ie && tinymce.Env.ie < 11 ) ? '' : '<br data-mce-bogus="1">';
                                 }
-
-                                return tag;
-                        });
-                }
+                        }
+                } );
         });
 
         editor.on( 'PostProcess', function( event ) {