From a6de675d146990a3a9d3f174fb42099c014efb4a Mon Sep 17 00:00:00 2001 From: Andrew Ozz Date: Wed, 23 Apr 2014 20:41:59 +0000 Subject: [PATCH] TinyMCE: when adding a caption to an image that is in a paragraph with other text, move the caption node above the paragraph instead of below. See #27922, for trunk. git-svn-id: https://develop.svn.wordpress.org/trunk@28190 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js | 4 ++-- src/wp-includes/version.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js b/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js index 050a1f53f6..8894cd8f57 100644 --- a/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js +++ b/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js @@ -320,7 +320,7 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) { if ( parent = dom.getParent( node, 'p' ) ) { wrap = dom.create( 'div', { 'class': 'mceTemp' }, html ); - dom.insertAfter( wrap, parent ); + parent.parentNode.insertBefore( wrap, parent ); dom.remove( node ); if ( dom.isEmpty( parent ) ) { @@ -593,7 +593,7 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) { if ( parent && parent.nodeName === 'P' ) { wrap = dom.create( 'div', { 'class': 'mceTemp' }, html ); - dom.insertAfter( wrap, parent ); + parent.parentNode.insertBefore( wrap, parent ); editor.selection.select( wrap ); editor.nodeChanged(); diff --git a/src/wp-includes/version.php b/src/wp-includes/version.php index b9c5a1cb1b..7387d63333 100644 --- a/src/wp-includes/version.php +++ b/src/wp-includes/version.php @@ -18,7 +18,7 @@ $wp_db_version = 27916; * * @global string $tinymce_version */ -$tinymce_version = '4021-20140412'; +$tinymce_version = '4021-20140423'; /** * Holds the required PHP version