Changeset 38156

Timestamp:

07/26/2016 09:50:51 PM (10 years ago)

Author:

azaozz

Message:

TinyMCE: fix selecting an image on touch in iOS Safari for TinyMCE 4.4.1.

Fixes #37427.

File:

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

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

@@ -80 +80 @@
         } );
 
+        function isNonEditable( node ) {
+                var parent = editor.$( node ).parents( '[contenteditable]' );
+                return parent && parent.attr( 'contenteditable' ) === 'false';
+        }
+
         // Safari on iOS fails to select images in contentEditoble mode on touch.
         // Select them again.
@@ -85 +90 @@
                 editor.on( 'init', function() {
                         editor.on( 'touchstart', function( event ) {
-                                if ( event.target.nodeName === 'IMG' ) {
+                                if ( event.target.nodeName === 'IMG' && ! isNonEditable( event.target ) ) {
                                         touchOnImage = true;
                                 }
                         });
 
-                        editor.dom.bind( editor.getDoc(), 'touchmove', function( event ) {
-                                if ( event.target.nodeName === 'IMG' ) {
-                                        touchOnImage = false;
-                                }
+                        editor.dom.bind( editor.getDoc(), 'touchmove', function() {
+                                touchOnImage = false;
                         });
 
                         editor.on( 'touchend', function( event ) {
-                                if ( touchOnImage && event.target.nodeName === 'IMG' ) {
+                                if ( touchOnImage && event.target.nodeName === 'IMG' && ! isNonEditable( event.target ) ) {
                                         var node = event.target;
 
@@ -105 +108 @@
                                                 editor.selection.select( node );
                                                 editor.nodeChanged();
-                                        }, 200 );
+                                        }, 100 );
                                 } else if ( toolbar ) {
                                         toolbar.hide();