Changeset 27451

Timestamp:

03/07/2014 06:33:06 AM (11 years ago)

Author:

azaozz

Message:

TinyMCE editimage: show the toolbar on mouseup to avoid accidental clicks on the buttons, fixes #24409

File:

• trunk/src/wp-includes/js/tinymce/plugins/wpeditimage/plugin.js (modified) (2 diffs)

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

@@ -775 +775 @@
 
     editor.on( 'mousedown', function( event ) {
-        var node = event.target;
-
-        if ( tinymce.Env.ie && editor.dom.getParent( node, '#wp-image-toolbar' ) ) {
-            // Stop IE > 8 from making the wrapper resizable on mousedown
-            event.preventDefault();
-        }
-
-        if ( node.nodeName === 'IMG' && ! editor.dom.getAttrib( node, 'data-wp-imgselect' ) && ! isPlaceholder( node ) ) {
-            addToolbar( node );
+        if ( editor.dom.getParent( event.target, '#wp-image-toolbar' ) ) {
+            if ( tinymce.Env.ie ) {
+                // Stop IE > 8 from making the wrapper resizable on mousedown
+                event.preventDefault();
+            }
+        } else if ( event.target.nodeName !== 'IMG' ) {
+            removeToolbar();
         }
     });
@@ -810 +808 @@
                 }
             }
+        } else if ( node.nodeName === 'IMG' && ! editor.dom.getAttrib( node, 'data-wp-imgselect' ) && ! isPlaceholder( node ) ) {
+            addToolbar( node );
         } else if ( node.nodeName !== 'IMG' ) {
             removeToolbar();