Merge pull request #55 from AnastasiaBuniakEPAM/JS-255

JS-330: Hide magnifier on video images
magento · Nov 27, 2015 · 5585249 · 5585249
2 parents 1b087f7 + e10f3e3
commit 5585249
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/lib/web/magnifier/magnify.js b/lib/web/magnifier/magnify.js
@@ -24,7 +24,9 @@ define([
             zoomOutLoaded = 'zoom-out-loaded',
             zoomInDisabled = 'fotorama__zoom-in--disabled',
             zoomOutDisabled = 'fotorama__zoom-out--disabled',
+            videoContainerClass = 'fotorama-video-container',
             hideMagnifier,
+            checkForVideo,
             behaveOnHover,
             dragFlag,
             endX,
@@ -736,6 +738,13 @@ define([
             $(magnifierZoomSelector).remove();
         };
 
+        /**
+         * Check for video container.
+         */
+        checkForVideo = function ($stageFrame) {
+            return $stageFrame.hasClass(videoContainerClass);
+        };
+
         /**
          * Hides magnifier on drag and while arrow click.
          */
@@ -785,10 +794,13 @@ define([
         });
 
         $(element).on('fotorama:load fotorama:showend fotorama:fullscreenexit fotorama:ready', function (e, fotorama) {
-            hideMagnifier();
-            config.magnifierOpts.large = $(gallerySelector).data('fotorama').activeFrame.img;
-            config.magnifierOpts.full = fotorama.data[fotorama.activeIndex].original;
-            $($(gallerySelector).data('fotorama').activeFrame.$stageFrame).magnify(config.magnifierOpts);
+            var $activeStageFrame = $(gallerySelector).data('fotorama').activeFrame.$stageFrame;
+            if (!$activeStageFrame.find(magnifierZoomSelector).length) {
+                hideMagnifier();
+                config.magnifierOpts.large = $(gallerySelector).data('fotorama').activeFrame.img;
+                config.magnifierOpts.full = fotorama.data[fotorama.activeIndex].original;
+                !checkForVideo($activeStageFrame) && $($activeStageFrame).magnify(config.magnifierOpts);
+            }
         });
         $(element).on('gallery:loaded', function (e) {
             var $prevImage;