Changeset 19984

Timestamp:

02/24/2012 07:18:59 PM (13 years ago)

Author:

azaozz

Message:

Don't show edit/remove image buttons in the visual editor when an image is floated, doesn't have a caption and there is text in the same paragraph, props solarissmoke, fixes #19611

File:

• trunk/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin_src.js (modified) (1 diff)

trunk/wp-includes/js/tinymce/plugins/wpeditimage/editor_plugin_src.js

@@ -70 +70 @@
             // show editimage buttons
             ed.onMouseDown.add(function(ed, e) {
-
-                if ( e.target && ( e.target.nodeName == 'IMG' || (e.target.firstChild && e.target.firstChild.nodeName == 'IMG') ) ) {
+                var target = e.target;
+
+                if ( target.nodeName != 'IMG' ) {
+                    if ( target.firstChild && target.firstChild.nodeName == 'IMG' && target.childNodes.length == 1 )
+                        target = target.firstChild;
+                    else
+                        return;
+                }
+
+                if ( ed.dom.getAttrib(target, 'class').indexOf('mceItem') == -1 ) {
                     mouse = {
                         x: e.clientX,
                         y: e.clientY,
-                        img_w: e.target.clientWidth,
-                        img_h: e.target.clientHeight
+                        img_w: target.clientWidth,
+                        img_h: target.clientHeight
                     };
 
-                    if ( ed.dom.getAttrib(e.target, 'class').indexOf('mceItem') == -1 )
-                        ed.plugins.wordpress._showButtons(e.target, 'wp_editbtns');
+                    ed.plugins.wordpress._showButtons(target, 'wp_editbtns');
                 }
             });