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

TinyMCE: when deleting an image, ensure the wrapping link (if any) is deleted too. Fixes the erroneous showing of the link toolbar after deleting an image. Also small readability fix. 

See #32604. 

git-svn-id: https://develop.svn.wordpress.org/trunk@33141 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Ozz 2015-07-09 00:24:34 +00:00
parent 3e5e085bb0
commit 128557239f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -820,7 +820,9 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
clearTimeout( timeout ); clearTimeout( timeout );
timeout = setTimeout( function() { timeout = setTimeout( function() {
activeToolbar && activeToolbar.show && activeToolbar.show(); if ( activeToolbar && typeof activeToolbar.show === 'function' ) {
activeToolbar.show();
}
}, 250 ); }, 250 );
} }
} }

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

@ -525,12 +525,10 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) {
} }
function removeImage( node ) { function removeImage( node ) {
var wrap; var wrap = editor.dom.getParent( node, 'div.mceTemp' );
if ( node.nodeName === 'DIV' && editor.dom.hasClass( node, 'mceTemp' ) ) { if ( ! wrap && node.nodeName === 'IMG' ) {
wrap = node; wrap = editor.dom.getParent( node, 'a' );
} else if ( node.nodeName === 'IMG' || node.nodeName === 'DT' || node.nodeName === 'A' ) {
wrap = editor.dom.getParent( node, 'div.mceTemp' );
} }
if ( wrap ) { if ( wrap ) {