Changeset 33141

Timestamp:

07/09/2015 12:24:34 AM (11 years ago)

Author:

azaozz

Message:

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.

Location:

trunk/src/wp-includes/js/tinymce/plugins

Files:

• wordpress/plugin.js (modified) (1 diff)
• wpeditimage/plugin.js (modified) (1 diff)

trunk/src/wp-includes/js/tinymce/plugins/wordpress/plugin.js

@@ -821 +821 @@
 
                     timeout = setTimeout( function() {
-                        activeToolbar && activeToolbar.show && activeToolbar.show();
+                        if ( activeToolbar && typeof activeToolbar.show === 'function' ) {
+                            activeToolbar.show();
+                        }
                     }, 250 );
                 }

trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js

@@ -526 +526 @@
 
     function removeImage( node ) {
-        var wrap;
-
-        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' );
+        var wrap = editor.dom.getParent( node, 'div.mceTemp' );
+
+        if ( ! wrap && node.nodeName === 'IMG' ) {
+            wrap = editor.dom.getParent( node, 'a' );
         }