Skip to content

Commit 8429451

Browse files
committed
MC-39279: [ CLARIFICATION ] Product zoom effect on iPhone is not similar to desktop or android zoom effect
1 parent 9eb8dc0 commit 8429451

File tree

1 file changed

+9
-12
lines changed

1 file changed

+9
-12
lines changed

lib/web/magnifier/magnify.js

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,11 @@ define([
3535
allowZoomOut = false,
3636
allowZoomIn = true;
3737

38-
(function () {
39-
var style = document.documentElement.style,
40-
transitionEnabled = style.transition !== undefined ||
41-
style.WebkitTransition !== undefined ||
42-
style.MozTransition !== undefined ||
43-
style.MsTransition !== undefined ||
44-
style.OTransition !== undefined;
45-
})();
38+
transitionEnabled = document.documentElement.style.transition !== undefined ||
39+
document.documentElement.style.WebkitTransition !== undefined ||
40+
document.documentElement.style.MozTransition !== undefined ||
41+
document.documentElement.style.MsTransition !== undefined ||
42+
document.documentElement.style.OTransition !== undefined;
4643

4744
/**
4845
* Return width and height of original image
@@ -314,7 +311,7 @@ define([
314311
ratio,
315312
dimentions = {};
316313

317-
if (allowZoomIn && (!transitionEnabled && !transitionActive) && (isTouchEnabled ||
314+
if (allowZoomIn && (!transitionEnabled || !transitionActive) && (isTouchEnabled ||
318315
!$(zoomInButtonSelector).hasClass(zoomInDisabled))) {
319316
$image = $(fullscreenImageSelector);
320317
imgOriginalSize = getImageSize($image[0]);
@@ -387,7 +384,7 @@ define([
387384
ratio,
388385
fitIntoParent;
389386

390-
if (allowZoomOut && (!transitionEnabled && !transitionActive) && (isTouchEnabled ||
387+
if (allowZoomOut && (!transitionEnabled || !transitionActive) && (isTouchEnabled ||
391388
!$(zoomOutButtonSelector).hasClass(zoomOutDisabled))) {
392389
allowZoomIn = true;
393390
$image = $(fullscreenImageSelector);
@@ -679,7 +676,7 @@ define([
679676
if ($image.hasClass(imageDraggableClass)) {
680677
$image.removeClass(imageDraggableClass);
681678
}
682-
} else if (gallery.fullScreen && (!transitionEnabled && !transitionActive)) {
679+
} else if (gallery.fullScreen && (!transitionEnabled || !transitionActive)) {
683680
imagePosY = getTop($image);
684681
imagePosX = $image.offset().left;
685682

@@ -719,7 +716,7 @@ define([
719716
var clientX,
720717
clientY;
721718

722-
if (gallery.fullScreen && isDragActive && (!transitionEnabled && !transitionActive)) {
719+
if (gallery.fullScreen && isDragActive && (!transitionEnabled || !transitionActive)) {
723720

724721
if (allowZoomOut && !$image.hasClass(imageDraggableClass)) {
725722
$image.addClass(imageDraggableClass);

0 commit comments

Comments
 (0)