Changeset 36597

Timestamp:

02/20/2016 07:55:03 PM (8 years ago)

Author:

azaozz

Message:

TinyMCE: fix the regex that removes spaces from empty paragraphs. Was causing problems when wpautop is disabled and there are many U+00A0 chars between the opening <p> and an inline tag. These chars are inserted by the browsers to maintain consecutive spaces typed by the users in contentEditable.

Fixes #35890.

File:

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

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

@@ -118 +118 @@
 
             // Remove spaces from empty paragraphs.
-            event.content = event.content.replace( /<p>(?:&nbsp;|\u00a0|\uFEFF|\s)+<\/p>/gi, '<p><br /></p>' );
+            // Avoid backtracking, can freeze the editor. See #35890.
+            // (This is also quite faster than using only one regex.)
+            event.content = event.content.replace( /<p>([^<>]+)<\/p>/gi, function( tag, text ) {
+                if ( /^(&nbsp;|\s|\u00a0|\ufeff)+$/i.test( text ) ) {
+                    return '<p><br /></p>';
+                }
+
+                return tag;
+            });
         }
     });