ACP2E-3198: [cloud] Two-finger zoom and move issue on the real mobile device

Author: aplapana

lib/web/magnifier/magnify.js

@@ -610,6 +610,7 @@ define([
             }
 
             function pointerMoveHandler(ev) {
+                let timeout;
                 for (let i = 0; i < evCache.length; i++) {
                     if (ev.pointerId === evCache[i].pointerId) {
                         evCache[i] = ev;
@@ -627,14 +628,16 @@ define([
                         if (curDiff - prevDiff > 0.2 && allowZoomIn) {
                             preventAction = true;
                             zoomIn(ev, curDiff, curDiff);
-                            setTimeout(() => {
+                            timeout = setTimeout(() => {
+                                clearTimeout(timeout);
                                 preventAction = false;
                             }, 500);
                         }
                         if (curDiff - prevDiff < -0.2 && allowZoomOut) {
                             preventAction = true;
                             zoomOut(ev, curDiff, curDiff);
-                            setTimeout(() => {
+                            timeout = setTimeout(() => {
+                                clearTimeout(timeout);
                                 preventAction = false;
                             }, 500);
                         }
@@ -692,13 +695,14 @@ define([
                     const curTime = new Date().getTime();
                     const tapLen = curTime - lastTap;
 
+                    transitionActive = false;
                     if (tapLen < 300 && tapLen > 50 && !preventAction) {
                         event.preventDefault();
 
-                        transitionActive = false;
                         preventAction = true;
                         dblClickHandler(event);
-                        setTimeout(() => {
+                        timeout = setTimeout(() => {
+                            clearTimeout(timeout);
                             preventAction = false;
                         }, 500);
                         prevDiff = -1;
@@ -733,6 +737,9 @@ define([
 
                 $image.off('touchend');
                 $image.on('touchend', detectDoubleTap());
+
+                $image.off('touchcancel');
+                $image.on('touchcancel', () => {transitionActive = false});
             } else {
                 $image.off('dblclick');
                 $image.on('dblclick', dblClickHandler);