Changeset 28685

Timestamp:

06/06/2014 04:19:09 AM (12 years ago)

Author:

azaozz

Message:

TinyMCE: remove &nbsp from empty paragraphs inside the visual editor, props avryl, fixes #28282

File:

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

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

@@ -356 +356 @@
 
                 // Keep empty paragraphs :(
-                e.content = e.content.replace( /<p>(<br ?\/?>|\u00a0|\uFEFF)?<\/p>/g, '<p>&nbsp;</p>' );
+                e.content = e.content.replace( /<p>(?:<br ?\/?>|\u00a0|\uFEFF| )*<\/p>/g, '<p>&nbsp;</p>' );
 
                 if ( editor.getParam( 'wpautop', true ) && typeof window.switchEditors !== 'undefined' ) {
                         e.content = window.switchEditors.pre_wpautop( e.content );
+                }
+        });
+
+        // Remove spaces from empty paragraphs.
+        editor.on( 'BeforeSetContent', function( event ) {
+                if ( event.content ) {
+                        event.content = event.content.replace( /<p>(?:&nbsp;|\u00a0|\uFEFF| )+<\/p>/gi, '<p></p>' );
                 }
         });