Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/js/_enqueues/wp/editor/base.js
Original file line number Diff line number Diff line change
Expand Up @@ -1127,6 +1127,8 @@ window.wp = window.wp || {};
return b.replace( /[\n\t ]+/, ' ' );
});

a = a.replace( /(<wp-temp-br[^>]*>)\s*\n\s*/g, '$1' );

return a.replace( /\s*\n\s*/g, '<wp-temp-br />' );
});
}
Expand Down
2 changes: 2 additions & 0 deletions tests/qunit/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@
<script src="../../build/wp-admin/js/customize-nav-menus.js"></script>
<script src="../../build/wp-admin/js/customize-widgets.js"></script>
<script src="../../build/wp-admin/js/word-count.js"></script>
<script src="../../build/wp-admin/js/editor.js"></script>

<script src="../../build/wp-admin/js/widgets/media-widgets.js"></script>
<script>
Expand Down Expand Up @@ -198,6 +199,7 @@
<script src="wp-admin/js/customize-nav-menus.js"></script>
<script src="wp-admin/js/customize-widgets.js"></script>
<script src="wp-admin/js/word-count.js"></script>
<script src="wp-admin/js/editor.js"></script>
<script src="wp-admin/js/nav-menu.js"></script>
<script src="wp-admin/js/widgets/test-media-widgets.js"></script>
<script src="wp-admin/js/widgets/test-media-image-widget.js"></script>
Expand Down
60 changes: 60 additions & 0 deletions tests/qunit/wp-admin/js/editor.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
( function( QUnit, wp ) {
QUnit.module( 'editor' );

QUnit.test( 'wp.editor.autop handles line breaks inside [caption] shortcodes correctly (#66373)', function( assert ) {
var tests = [
{
message: 'Preserves <br />\\n inside [caption] without doubling to <br /><br />',
input: '[caption id="attachment_123" align="alignnone" width="300"]<img src="test.jpg" /> Caption line 1<br />\nCaption line 2[/caption]',
expected: '[caption id="attachment_123" align="alignnone" width="300"]<img src="test.jpg" /> Caption line 1<br />Caption line 2[/caption]\n'
},
{
message: 'Preserves <br>\\n inside [caption] without doubling to <br><br>',
input: '[caption id="attachment_123" align="alignnone" width="300"]<img src="test.jpg" /> Caption line 1<br>\nCaption line 2[/caption]',
expected: '[caption id="attachment_123" align="alignnone" width="300"]<img src="test.jpg" /> Caption line 1<br>Caption line 2[/caption]\n'
},
{
message: 'Preserves <br />\\r\\n (Windows newlines) inside [caption] without doubling',
input: '[caption id="attachment_123" align="alignnone" width="300"]<img src="test.jpg" /> Caption line 1<br />\r\nCaption line 2[/caption]',
expected: '[caption id="attachment_123" align="alignnone" width="300"]<img src="test.jpg" /> Caption line 1<br />Caption line 2[/caption]\n'
},
{
message: 'Preserves attributes on <br> followed by newline inside [caption]',
input: '[caption id="attachment_123" align="alignnone" width="300"]<img src="test.jpg" /> Caption line 1<br class="custom" />\nCaption line 2[/caption]',
expected: '[caption id="attachment_123" align="alignnone" width="300"]<img src="test.jpg" /> Caption line 1<br class="custom" />Caption line 2[/caption]\n'
},
{
message: 'Preserves <br /> without trailing newline inside [caption]',
input: '[caption id="attachment_123" align="alignnone" width="300"]<img src="test.jpg" /> Caption line 1<br />Caption line 2[/caption]',
expected: '[caption id="attachment_123" align="alignnone" width="300"]<img src="test.jpg" /> Caption line 1<br />Caption line 2[/caption]\n'
},
{
message: 'Converts plain newline \\n inside [caption] to <br />',
input: '[caption id="attachment_123" align="alignnone" width="300"]<img src="test.jpg" /> Caption line 1\nCaption line 2[/caption]',
expected: '[caption id="attachment_123" align="alignnone" width="300"]<img src="test.jpg" /> Caption line 1<br />Caption line 2[/caption]\n'
},
{
message: 'Handles multiple lines with <br />\\n inside [caption]',
input: '[caption id="attachment_123" align="alignnone" width="300"]<img src="test.jpg" /> Line 1<br />\nLine 2<br />\nLine 3[/caption]',
expected: '[caption id="attachment_123" align="alignnone" width="300"]<img src="test.jpg" /> Line 1<br />Line 2<br />Line 3[/caption]\n'
}
];

_.each( tests, function( test ) {
assert.equal( wp.editor.autop( test.input ), test.expected, test.message );
} );
} );

QUnit.test( 'wp.editor.autop maintains stability across repeated autop and removep cycles (#66373)', function( assert ) {
var content = '[caption id="attachment_123" align="alignnone" width="300"]<img src="test.jpg" /> Caption line 1<br />\nCaption line 2[/caption]';
var firstPass = wp.editor.autop( content );

// Simulating repeated toggling between Text and Visual editors.
var current = firstPass;
for ( var i = 0; i < 5; i++ ) {
current = wp.editor.autop( wp.editor.removep( current ) );
}

assert.equal( current, firstPass, 'Content does not accumulate extra <br> tags over multiple editor toggle cycles' );
} );
} )( window.QUnit, window.wp );
Loading