vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-07-02 08:10:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TinyMCE: remove the empty paragraph that sometimes is left over after adding an image caption.

Browse Source 
Fixes #32003.

git-svn-id: https://develop.svn.wordpress.org/trunk@32141 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz
2015-04-18 21:55:45 +00:00
parent 9781cdb9a3
commit ab5685e6ad
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js
View File

@@ -452,15 +452,15 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) {
if ( parent = dom.getParent( node, 'p' ) ) {
parent.parentNode.insertBefore( wrap, parent );
if ( dom.isEmpty( parent ) ) {
dom.remove( parent );
}
} else {
node.parentNode.insertBefore( wrap, node );
}
editor.$( wrap ).find( 'dt.wp-caption-dt' ).append( node );
if ( parent && dom.isEmpty( parent ) ) {
dom.remove( parent );
}
}
} else if ( captionNode ) {
// Remove the caption wrapper and place the image in new paragraph
@@ -734,15 +734,15 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) {
if ( parent = dom.getParent( node, 'p' ) ) {
parent.parentNode.insertBefore( wrap, parent );
if ( dom.isEmpty( parent ) ) {
dom.remove( parent );
}
} else {
node.parentNode.insertBefore( wrap, node );
}
editor.$( wrap ).find( 'dt.wp-caption-dt' ).append( node );
if ( parent && dom.isEmpty( parent ) ) {
dom.remove( parent );
}
}
} else {
if ( wrap ) {