sergiotarxz/Wordpress
sergiotarxz/Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

TinyMCE: fix alignment buttons when used on image with caption. Remove old/unneeded code. Fixes #28705.

Browse Source 
git-svn-id: https://develop.svn.wordpress.org/trunk@29370 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz 2014-08-04 00:51:19 +00:00
parent daf4baf3ed
commit 040ac15f50
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -794,29 +794,15 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) {
dom.insertAfter( p, node ); dom.insertAfter( p, node );
editor.selection.setCursorLocation( p, 0 ); editor.selection.setCursorLocation( p, 0 );
editor.nodeChanged(); editor.nodeChanged();
if ( tinymce.Env.ie > 8 ) {
setTimeout( function() {
editor.selection.setCursorLocation( p, 0 );
editor.selection.setContent( event.value );
}, 500 );
return false;
}
} }
} else if ( cmd === 'JustifyLeft' || cmd === 'JustifyRight' || cmd === 'JustifyCenter' ) { } else if ( cmd === 'JustifyLeft' || cmd === 'JustifyRight' || cmd === 'JustifyCenter' ) {
node = editor.selection.getNode(); node = editor.selection.getNode();
align = cmd.substr(7).toLowerCase(); align = cmd.substr(7).toLowerCase();
align = 'align' + align; align = 'align' + align,
DL = dom.getParent( node, 'dl.wp-caption' );
removeToolbar(); removeToolbar();
if ( dom.is( node, 'dl.wp-caption' ) ) {
DL = node;
} else {
DL = dom.getParent( node, 'dl.wp-caption' );
}
if ( DL ) { if ( DL ) {
// When inside an image caption, set the align* class on dl.wp-caption // When inside an image caption, set the align* class on dl.wp-caption
if ( dom.hasClass( DL, align ) ) { if ( dom.hasClass( DL, align ) ) {
@ -827,7 +813,12 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) {
dom.addClass( DL, align ); dom.addClass( DL, align );
} }
return false; if ( node.nodeName === 'IMG' ) {
// Re-select the image to update resize handles, etc.
editor.nodeChanged();
}
event.preventDefault();
} }
if ( node.nodeName === 'IMG' ) { if ( node.nodeName === 'IMG' ) {