WordPress.org

Make WordPress Core

Changeset 28231


Ignore:
Timestamp:
05/01/2014 04:41:05 AM (5 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:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/3.9

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

    r28095 r28231  
    321321                if ( parent = dom.getParent( node, 'p' ) ) {
    322322                    wrap = dom.create( 'div', { 'class': 'mceTemp' }, html );
    323                     dom.insertAfter( wrap, parent );
     323                    parent.parentNode.insertBefore( wrap, parent );
    324324                    dom.remove( node );
    325325
     
    594594                    if ( parent && parent.nodeName === 'P' ) {
    595595                        wrap = dom.create( 'div', { 'class': 'mceTemp' }, html );
    596                         dom.insertAfter( wrap, parent );
     596                        parent.parentNode.insertBefore( wrap, parent );
    597597                        editor.selection.select( wrap );
    598598                        editor.nodeChanged();
  • branches/3.9/src/wp-includes/version.php

    r28156 r28231  
    1919 * @global string $tinymce_version
    2020 */
    21 $tinymce_version = '4021-20140412';
     21$tinymce_version = '4021-20140423';
    2222
    2323/**
Note: See TracChangeset for help on using the changeset viewer.