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.

azaozz · azaozz · commit 128557239f35 · 2015-07-09T00:24:34.000Z
See #32604. git-svn-id: https://develop.svn.wordpress.org/trunk@33141 602fd350-edb4-49c9-b593-d223f7449a82
diff --git a/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js b/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js
@@ -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 );
 				}
 			}
diff --git a/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js b/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js
@@ -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 ) {

Original file line number	Diff line number	Diff line change
`@@ -820,7 +820,9 @@ tinymce.PluginManager.add( 'wordpress', function( editor ) {`
`820`	`820`	`clearTimeout( timeout );`
`821`	`821`
`822`	`822`	`timeout = setTimeout( function() {`
`823`		`- activeToolbar && activeToolbar.show && activeToolbar.show();`
	`823`	`+ if ( activeToolbar && typeof activeToolbar.show === 'function' ) {`
	`824`	`+ activeToolbar.show();`
	`825`	`+ }`
`824`	`826`	`}, 250 );`
`825`	`827`	`}`
`826`	`828`	`}`
Original file line number	Diff line number	Diff line change
`@@ -525,12 +525,10 @@ tinymce.PluginManager.add( 'wpeditimage', function( editor ) {`
`525`	`525`	`}`
`526`	`526`
`527`	`527`	`function removeImage( node ) {`
`528`		`- var wrap;`
	`528`	`+ var wrap = editor.dom.getParent( node, 'div.mceTemp' );`
`529`	`529`
`530`		`- if ( node.nodeName === 'DIV' && editor.dom.hasClass( node, 'mceTemp' ) ) {`
`531`		`- wrap = node;`
`532`		`- } else if ( node.nodeName === 'IMG' \|\| node.nodeName === 'DT' \|\| node.nodeName === 'A' ) {`
`533`		`- wrap = editor.dom.getParent( node, 'div.mceTemp' );`
	`530`	`+ if ( ! wrap && node.nodeName === 'IMG' ) {`
	`531`	`+ wrap = editor.dom.getParent( node, 'a' );`
`534`	`532`	`}`
`535`	`533`
`536`	`534`	`if ( wrap ) {`