From 031d8ec39d2350054b6aa2f0cabe338c0b35bb00 Mon Sep 17 00:00:00 2001
From: Graham Wharton <graham@gwharton.me.uk>
Date: Fri, 19 Oct 2018 11:39:21 +0100
Subject: [PATCH 1/2] Forwardport of MAGETWO-93818: Magnifier function does not
 disappear after mouse-off the image from the bottom

Added onMouseLeave events
---
 lib/web/magnifier/magnifier.js | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/lib/web/magnifier/magnifier.js b/lib/web/magnifier/magnifier.js
index 150c8adf0b22b..b48ffa6f50b18 100644
--- a/lib/web/magnifier/magnifier.js
+++ b/lib/web/magnifier/magnifier.js
@@ -554,6 +554,15 @@
             thumbObj.src = thumb.src;
         }
 
+        /**
+         * Hide magnifier when mouse exceeds image bounds.
+         */
+        function onMouseLeave() {
+            onThumbLeave();
+            isOverThumb = false;
+            $magnifierPreview.addClass(MagnifyCls.magnifyHidden);
+        }
+
         function onMousemove(e) {
             pos.x = e.clientX;
             pos.y = e.clientY;
@@ -564,15 +573,9 @@
                 isOverThumb = inBounds;
             }
 
-            if (inBounds && isOverThumb) {
-                if(gMode === 'outside'){
-                    $magnifierPreview.removeClass(MagnifyCls.magnifyHidden);
-                }
+            if (inBounds && isOverThumb && gMode === 'outside') {
+                $magnifierPreview.removeClass(MagnifyCls.magnifyHidden);
                 move();
-            } else {
-                onThumbLeave();
-                isOverThumb = false;
-                $magnifierPreview.addClass(MagnifyCls.magnifyHidden);
             }
         }
 
@@ -589,6 +592,8 @@
         });
 
         $box.on('mousemove', onMousemove);
+        $box.on('mouseleave', onMouseLeave);
+        
         _init($box, customUserOptions);
     }
 }(jQuery));

From 4b76ffdc54c19f0fe642761540120744b8d0fc43 Mon Sep 17 00:00:00 2001
From: Graham Wharton <graham@gwharton.me.uk>
Date: Fri, 19 Oct 2018 12:17:36 +0100
Subject: [PATCH 2/2] Fixed whitespace issue

---
 lib/web/magnifier/magnifier.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/web/magnifier/magnifier.js b/lib/web/magnifier/magnifier.js
index b48ffa6f50b18..0807a4c394995 100644
--- a/lib/web/magnifier/magnifier.js
+++ b/lib/web/magnifier/magnifier.js
@@ -593,7 +593,7 @@
 
         $box.on('mousemove', onMousemove);
         $box.on('mouseleave', onMouseLeave);
-        
+
         _init($box, customUserOptions);
     }
 }(jQuery));