Merge remote-tracking branch 'origin/port-2572' into port-2572

Author: viktym

lib/web/magnifier/magnify.js

@@ -277,7 +277,6 @@ define([
 
                 settings = $.extend(dimentions, {
                     top: top,
-                    bottom: bottom,
                     left: left,
                     right: right
                 });
@@ -557,6 +556,16 @@ define([
                 trailing: false
             });
 
+            /**
+             * Returns top position value for passed jQuery object.
+             *
+             * @param $el
+             * @return {number}
+             */
+            function getTop($el) {
+                return parseInt($el.get(0).style.top);
+            }
+
             function shiftImage(dx, dy, e) {
                 var top = +imagePosY + dy,
                     left = +imagePosX + dx,
@@ -584,16 +593,13 @@ define([
                 }
 
                 if ($image.height() > $imageContainer.height()) {
-
-                    if ($imageContainer.offset().top + $imageContainer.height() > top + $image.height()) {
-                        top = $imageContainer.offset().top + $imageContainer.height() - $image.height();
+                    if ($imageContainer.height() > $image.height() + top) {
+                        $image.css('top', $imageContainer.height() - $image.height());
                     } else {
-                        top = $imageContainer.offset().top < top ? 0 : top;
+                        top = $image.height() - getTop($image) - $imageContainer.height();
+                        dy = dy < top ? dy : top;
+                        $image.css('top', getTop($image) + dy);
                     }
-                    $image.offset({
-                        'top': top
-                    });
-                    $image.css('bottom', '');
                 }
 
                 if ($image.width() > $imageContainer.width()) {
@@ -690,7 +696,7 @@ define([
                 } else if (gallery.fullScreen && (!transitionEnabled || !transitionActive)) {
                     e.preventDefault();
 
-                    imagePosY = $image.offset().top;
+                    imagePosY = getTop($image);
                     imagePosX = $image.offset().left;
 
                     if (isTouchEnabled) {
@@ -746,6 +752,7 @@ define([
                         }
 
                         if (allowZoomOut) {
+                            imagePosY = getTop($(fullscreenImageSelector, $gallery));
                             shiftImage(clientX - startX, clientY - startY, e);
                         }
                     }
@@ -771,13 +778,13 @@ define([
                     isFullScreen = $(gallerySelector).data('fotorama').fullScreen,
                     initVars = function () {
                         imagePosX = $(fullscreenImageSelector, $gallery).offset().left;
-                        imagePosY = $(fullscreenImageSelector, $gallery).offset().top;
+                        imagePosY = getTop($(fullscreenImageSelector, $gallery));
                     };
 
                 if (($focus.attr('data-gallery-role') || !$focus.length) && allowZoomOut) {
                     if (isFullScreen) {
                         imagePosX = $(fullscreenImageSelector, $(gallerySelector)).offset().left;
-                        imagePosY = $(fullscreenImageSelector, $(gallerySelector)).offset().top;
+                        imagePosY = getTop($(fullscreenImageSelector, $(gallerySelector)));
                     }
 
                     if (e.keyCode === 39) {