Ticket #29235: 29235.patch

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

@@ -549 +549 @@
         }
 
         if ( 'ontouchend' in document ) {
-                editor.on( 'touchend', edit );
-
                 editor.on( 'click', function( event ) {
                         var target = event.target;
 
@@ -563 +561 @@
                                 event.stopPropagation();
                         }
                 });
-        } else {
-                editor.on( 'mouseup', edit );
         }
 
+        editor.on( 'mouseup touchend', edit );
+
         editor.on( 'init', function() {
                 var dom = editor.dom,
                         captionClass = editor.getParam( 'wpeditimage_html5_captions' ) ? 'html5-captions' : 'html4-captions';

src/wp-includes/js/tinymce/plugins/wpview/plugin.js

@@ -11 +11 @@
                 toRemove = false,
                 firstFocus = true,
                 _noop = function() { return false; },
-                isTouchDevice = ( 'ontouchend' in document ),
+                isios = /iPad|iPod|iPhone/.test( navigator.userAgent ),
                 cursorInterval, lastKeyDownNode, setViewCursorTries, focus, execCommandView;
 
         function getView( node ) {
@@ -141 +141 @@
                 dom.bind( selected, 'beforedeactivate focusin focusout', _stop );
 
                 // select the hidden div
-                if ( isTouchDevice ) {
+                if ( isios ) {
                         editor.selection.select( clipboard );
                 } else {
                         editor.selection.select( clipboard, true );
@@ -298 +298 @@
                 });
 
                 editor.on( 'mousedown mouseup click touchend', function( event ) {
-                        var view = getView( event.target ),
-                                type = isTouchDevice ? 'touchend' : 'mousedown';
+                        var view = getView( event.target );
 
                         firstFocus = false;
 
@@ -308 +307 @@
                                 event.stopImmediatePropagation();
                                 event.preventDefault();
 
-                                if ( event.type === type && ! event.metaKey && ! event.ctrlKey ) {
+                                if ( ( event.type === 'touchend' || event.type === 'mousedown' ) && ! event.metaKey && ! event.ctrlKey ) {
                                         if ( editor.dom.hasClass( event.target, 'edit' ) ) {
                                                 wp.mce.views.edit( view );
                                                 editor.focus();
@@ -329 +328 @@
                                 // Unfortunately, it also inhibits the dragging of views to a new location.
                                 return false;
                         } else {
-                                if ( event.type === type ) {
+                                if ( event.type === 'touchend' || event.type === 'mousedown' ) {
                                         deselect();
                                 }
                         }