Merge pull request #80 from AnastasiaBuniakEPAM/JS-375

Js 375: ProductVideo works incorect when Gallery updates
magento · Jan 25, 2016 · 249756f · 249756f
2 parents 9277cb9 + 5883b26
commit 249756f
Show file tree

Hide file tree

Showing 9 changed files with 185 additions and 165 deletions.
diff --git a/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js b/app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js
@@ -271,27 +271,28 @@ define([
                 });
 
                 imgToUpdate = mainImg.length ? mainImg[0] : imagesArr[0];
-
-                !imgToUpdate.type && (imgToUpdate.type = 'image');
-
                 galleryObject.updateDataByIndex(0, imgToUpdate);
                 galleryObject.seek(1);
             }
 
             if (galleryObject) {
                 if (images) {
+                    images.map(function (img) {
+                        img.type = 'image';
+                    });
+
                     if (this.options.onlyMainImg) {
                         updateGallery(images);
                     } else {
-                        images.map(function (img) {
-                            img.type = 'image';
-                        });
                         galleryObject.updateData(images)
                     }
                 } else {
-                    this.options.onlyMainImg ?
-                        updateGallery(initialImages) :
+                    if (this.options.onlyMainImg) {
+                        updateGallery(initialImages);
+                    } else {
                         galleryObject.updateData(this.options.mediaGalleryInitial);
+                        $(this.options.mediaGallerySelector).AddFotoramaVideoEvents();
+                    }
                 }
             }
         },

diff --git a/app/code/Magento/ProductVideo/view/frontend/templates/product/view/gallery.phtml b/app/code/Magento/ProductVideo/view/frontend/templates/product/view/gallery.phtml
@@ -14,8 +14,8 @@
     {
         "[data-gallery-role=gallery-placeholder]": {
             "Magento_ProductVideo/js/fotorama-add-video-events": {
-                "fotoramaVideoData": <?php /* @escapeNotVerified */ echo $block->getMediaGalleryDataJson(); ?>,
-                "fotoramaVideoSettings": <?php /* @escapeNotVerified */ echo $block->getVideoSettingsJson(); ?>
+                "videoData": <?php /* @escapeNotVerified */ echo $block->getMediaGalleryDataJson(); ?>,
+                "videoSettings": <?php /* @escapeNotVerified */ echo $block->getVideoSettingsJson(); ?>
             }
         }
     }