Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-27 22:58:40 +02:00
Code Issues Projects Releases Wiki Activity

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.

Browse Source 
Built from https://develop.svn.wordpress.org/trunk@28190


git-svn-id: http://core.svn.wordpress.org/trunk@28020 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrew Ozz 2014-04-23 20:42:14 +00:00
parent 3eb1616925
commit 7b4d339454
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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();

2
wp-includes/js/tinymce/plugins/wpeditimage/plugin.min.js vendored
View File

File diff suppressed because one or more lines are too long

BIN
wp-includes/js/tinymce/wp-tinymce.js.gz
View File

Binary file not shown.

2
wp-includes/version.php
View File

@ -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