From 1b043c1492a3d924c8f3339982d8098e16032af6 Mon Sep 17 00:00:00 2001
From: Adam Silverstein <adamsilverstein@git.wordpress.org>
Date: Fri, 9 Mar 2018 17:26:53 +0000
Subject: [PATCH] Media: Fix image cropping on touch screen devices.

* In initCrop, handle touch events in addition to mouse events.
* In imageSelect jQuery plugin, accept event.which of 0 as provided by touch events.

Props yahil, alexgso, joemcgill.
Fixes #41242.


git-svn-id: https://develop.svn.wordpress.org/trunk@42818 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/js/image-edit.js                            | 2 +-
 src/wp-includes/js/imgareaselect/jquery.imgareaselect.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/wp-admin/js/image-edit.js b/src/wp-admin/js/image-edit.js
index a47ddc7299..72f0405373 100644
--- a/src/wp-admin/js/image-edit.js
+++ b/src/wp-admin/js/image-edit.js
@@ -653,7 +653,7 @@
 				 *
 				 * @returns {void}
 				 */
-				parent.children().mousedown(function(e){
+				parent.children().on( 'mousedown, touchstart', function(e){
 					var ratio = false, sel, defRatio;
 
 					if ( e.shiftKey ) {
diff --git a/src/wp-includes/js/imgareaselect/jquery.imgareaselect.js b/src/wp-includes/js/imgareaselect/jquery.imgareaselect.js
index f017895f15..a80c3626b9 100644
--- a/src/wp-includes/js/imgareaselect/jquery.imgareaselect.js
+++ b/src/wp-includes/js/imgareaselect/jquery.imgareaselect.js
@@ -748,7 +748,7 @@ $.imgAreaSelect = function (img, options) {
      */
     function imgMouseDown(event) {
         /* Ignore the event if animation is in progress */
-        if (event.which != 1 || $outer.is(':animated')) return false;
+        if (event.which > 1 || $outer.is(':animated')) return false;
 
         adjust();
         startX = x1 = evX(event);