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:
parent
3e5e085bb0
commit
128557239f
|
@ -820,7 +820,9 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {
|
|||
clearTimeout( timeout );
|
||||
|
||||
timeout = setTimeout( function() {
|
||||
activeToolbar && activeToolbar.show && activeToolbar.show();
|
||||
if ( activeToolbar && typeof activeToolbar.show === 'function' ) {
|
||||
activeToolbar.show();
|
||||
}
|
||||
}, 250 );
|
||||
}
|
||||
}
|
||||
|
|
|
@ -525,12 +525,10 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) {
|
|||
}
|
||||
|
||||
function removeImage( node ) {
|
||||
var wrap;
|
||||
var wrap = editor.dom.getParent( node, 'div.mceTemp' );
|
||||
|
||||
if ( node.nodeName === 'DIV' && editor.dom.hasClass( node, 'mceTemp' ) ) {
|
||||
wrap = node;
|
||||
} else if ( node.nodeName === 'IMG' || node.nodeName === 'DT' || node.nodeName === 'A' ) {
|
||||
wrap = editor.dom.getParent( node, 'div.mceTemp' );
|
||||
if ( ! wrap && node.nodeName === 'IMG' ) {
|
||||
wrap = editor.dom.getParent( node, 'a' );
|
||||
}
|
||||
|
||||
if ( wrap ) {
|
||||
|
|
Loading…
Reference in New Issue