Changeset 40787

Timestamp:

05/18/2017 10:55:00 PM (7 years ago)

Author:

azaozz

Message:

Editor: When stripping paragraph tags, and there is a <br> at the beginning or the end, merge them and keep the paragraph, not the <br>.

Props rellect.
Fixes #37066.

File:

• trunk/src/wp-admin/js/editor.js (modified) (1 diff)

trunk/src/wp-admin/js/editor.js

@@ -225 +225 @@
             html = html.replace( /\n[\s\u00a0]+\n/g, '\n\n' );
 
-            // Rrplace <br> tags with a line break.
-            html = html.replace( /\s*<br ?\/?>\s*/gi, '\n' );
+            // Replace <br> tags with line breaks.
+            html = html.replace( /(\s*)<br ?\/?>\s*/gi, function( match, space ) {
+                if ( space && space.indexOf( '\n' ) !== -1 ) {
+                    return '\n\n';
+                }
+
+                return '\n';
+            });
 
             // Fix line breaks around <div>.