Changeset 29521

Timestamp:

08/17/2014 08:10:16 PM (11 years ago)

Author:

azaozz

Message:

TinyMCE: fix the edit image and wpview buttons on touch screen PCs, fixes #29235.

Location:

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

Files:

• wpeditimage/plugin.js (modified) (2 diffs)
• wpview/plugin.js (modified) (5 diffs)

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

@@ -550 +550 @@
 
     if ( 'ontouchend' in document ) {
-        editor.on( 'touchend', edit );
-
         editor.on( 'click', function( event ) {
             var target = event.target;
@@ -564 +562 @@
             }
         });
-    } else {
-        editor.on( 'mouseup', edit );
-    }
+    }
+
+    editor.on( 'mouseup touchend', edit );
 
     editor.on( 'init', function() {

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

@@ -12 +12 @@
         firstFocus = true,
         _noop = function() { return false; },
-        isTouchDevice = ( 'ontouchend' in document ),
+        isios = /iPad|iPod|iPhone/.test( navigator.userAgent ),
         cursorInterval, lastKeyDownNode, setViewCursorTries, focus, execCommandView;
 
@@ -142 +142 @@
 
         // select the hidden div
-        if ( isTouchDevice ) {
+        if ( isios ) {
             editor.selection.select( clipboard );
         } else {
@@ -299 +299 @@
 
         editor.on( 'mousedown mouseup click touchend', function( event ) {
-            var view = getView( event.target ),
-                type = isTouchDevice ? 'touchend' : 'mousedown';
+            var view = getView( event.target );
 
             firstFocus = false;
@@ -309 +308 @@
                 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 );
@@ -330 +329 @@
                 return false;
             } else {
-                if ( event.type === type ) {
+                if ( event.type === 'touchend' || event.type === 'mousedown' ) {
                     deselect();
                 }