Changeset 28231 for branches/3.9

Timestamp:

05/01/2014 04:41:05 AM (11 years ago)

Author:

nacin

Message:

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.

Merges [28190] to the 3.9 branch.

props azaozz.
fixes #27922.

Location:

branches/3.9

Files:

• . (modified) (1 prop)
• src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js (modified) (2 diffs)
• src/wp-includes/version.php (modified) (1 diff)

branches/3.9/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js

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

branches/3.9/src/wp-includes/version.php

@@ -19 +19 @@
  * @global string $tinymce_version
  */
-$tinymce_version = '4021-20140412';
+$tinymce_version = '4021-20140423';
 
 /**