Merge pull request #85 from AnastasiaBuniakEPAM/JS-323

JS-370: Gallery. Missconfiguration on theme level should not break JS…
magento · Jan 4, 2016 · e50f75b · e50f75b
2 parents db18db2 + 3957067
commit e50f75b
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/lib/web/magnifier/magnify.js b/lib/web/magnifier/magnify.js
@@ -854,9 +854,11 @@ define([
             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);
+                if (config.magnifierOpts) {
+                    config.magnifierOpts.large = $(gallerySelector).data('fotorama').activeFrame.img;
+                    config.magnifierOpts.full = fotorama.data[fotorama.activeIndex].original;
+                    !checkForVideo($activeStageFrame) && $($activeStageFrame).magnify(config.magnifierOpts);
+                }
             }
         });