Changeset 39902

Timestamp:

01/15/2017 02:05:44 AM (8 years ago)

Author:

azaozz

Message:

TinyMCE: improve removal of spaces from empty paragraphs when loading HTML in the editor.

Fixes #39437.

File:

• trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js (modified) (1 diff)

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

@@ -130 +130 @@
                 } );
             }
-
-            // 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>';
-                }
-
-                return tag;
-            });
-        }
+        }
+    });
+
+    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">';
+                }
+            }
+        } );
     });