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

Author: aplapana

lib/web/magnifier/magnify.js

@@ -370,7 +370,7 @@ define([
             return false;
         }
 
-        function zoomOut(e, xStep, yStep) {
+        function zoomOut(e, xStep, yStep, fitIntoParentFlag = false) {
             var $image,
                 widthResult,
                 heightResult,
@@ -381,8 +381,7 @@ define([
                 imageHeight,
                 zoomWidthStep,
                 zoomHeightStep,
-                ratio,
-                fitIntoParent;
+                ratio;
 
             if (allowZoomOut && (!transitionEnabled || !transitionActive) && (isTouchEnabled ||
                 !$(zoomOutButtonSelector).hasClass(zoomOutDisabled))) {
@@ -408,7 +407,7 @@ define([
                     zoomWidthStep = xStep || imageWidth - widthResult;
                 }
 
-                fitIntoParent = function () {
+                let fitIntoParent = function () {
                     if (ratio > parentWidth / parentHeight) {
                         widthResult = parentWidth;
                         zoomWidthStep = imageWidth - widthResult;
@@ -445,9 +444,11 @@ define([
                         };
                         checkFullscreenImagePosition($image, dimensions, zoomWidthStep, zoomHeightStep);
                     } else {
-                        allowZoomOut = dragFlag = false;
                         toggleStandartNavigation();
-                        fitIntoParent();
+                        if (fitIntoParentFlag) {
+                            allowZoomOut = dragFlag = false;
+                            fitIntoParent();
+                        }
                     }
                 } else if (heightResult > parentHeight) {
                     dimensions = {
@@ -462,9 +463,11 @@ define([
                     };
                     checkFullscreenImagePosition($image, dimensions, zoomWidthStep, zoomHeightStep);
                 } else {
-                    allowZoomOut = dragFlag = false;
                     toggleStandartNavigation();
-                    fitIntoParent();
+                    if (fitIntoParentFlag) {
+                        allowZoomOut = dragFlag = false;
+                        fitIntoParent();
+                    }
                 }
             }
 
@@ -627,11 +630,11 @@ define([
                     );
 
                     if (prevDiff > 0) {
-                        if (curDiff > prevDiff && allowZoomIn) {
-                            zoomIn(ev, 1.5 * curDiff, 1.5 * curDiff);
+                        if (curDiff - prevDiff > 0.2 && allowZoomIn) {
+                            zoomIn(ev, curDiff, curDiff);
                         }
-                        if (curDiff < prevDiff && allowZoomOut) {
-                            zoomOut(ev, 1.5 * curDiff, 1.5 * curDiff);
+                        if (curDiff - prevDiff < -0.2 && allowZoomOut) {
+                            zoomOut(ev, curDiff, curDiff);
                         }
                     }
 
@@ -675,7 +678,12 @@ define([
                 if (allowZoomIn) {
                     zoomIn(e, imgOriginalSize.rw - $image.width(), imgOriginalSize.rh - $image.height());
                 } else if (allowZoomOut) {
-                    zoomOut(e, imgOriginalSize.rw * proportions, imgOriginalSize.rh - $imageContainer.height());
+                    zoomOut(
+                        e,
+                        imgOriginalSize.rw * proportions,
+                        imgOriginalSize.rh - $imageContainer.height(),
+                        true
+                    );
                 }
             }