Merge branch 'JS-323' into JS-372

Author: uharbachou

app/code/Magento/Catalog/view/frontend/templates/product/view/gallery.phtml

@@ -21,7 +21,7 @@
     </div>
 </div>
 <!--Fix for jumping content. Loader must be the same size as gallery.-->
-<script type="text/javascript">
+<script>
     var config = {
             "width": <?php /* @escapeNotVerified */ echo $block->getImageAttribute('product_page_image_medium', 'width'); ?>,
             "thumbheight": <?php /* @escapeNotVerified */ echo $block->getImageAttribute('product_page_image_small', 'height')

app/code/Magento/ConfigurableProduct/view/frontend/web/js/configurable.js

@@ -7,12 +7,11 @@ define([
     'jquery',
     'underscore',
     'mage/template',
-    'mage/gallery/preloadImages',
     'priceUtils',
     'priceBox',
     'jquery/ui',
     'jquery/jquery.parsequery'
-], function ($, _, mageTemplate, preloadImages) {
+], function ($, _, mageTemplate) {
     'use strict';
 
     $.widget('mage.configurable', {
@@ -40,10 +39,6 @@ define([
             // Initial setting of various option values
             this._initializeOptions();
 
-            //Preload all gallery images
-            this._preloadImages();
-            this._preloadOptionalImages();
-
             // Override defaults with URL query parameters and/or inputs values
             this._overrideDefaults();
 
@@ -93,43 +88,6 @@ define([
             });
         },
 
-        /**
-         * Preloads default configuration images.
-         * @private
-         */
-        _preloadImages: function () {
-            var options = this.options,
-                fullImagesList = [], 
-                imagesList = [];
-
-            _.each(options.mediaGalleryInitial, function (item) {
-                imagesList.push(item.img);
-                fullImagesList.push(item.full);
-            });
-            preloadImages(imagesList);
-            preloadImages(fullImagesList);
-        },
-
-        /**
-         * Preloads optional configuration images.
-         * @private
-         */
-        _preloadOptionalImages: function () {
-            var options = this.options;
-
-            _.each(options.spConfig.images, function (array) {
-                var fullImagesList = [], 
-                    imagesList = [];
-
-                _.each(array, function (item) {
-                    imagesList.push(item.img);
-                    fullImagesList.push(item.full);
-                });
-                preloadImages(imagesList);
-                preloadImages(fullImagesList);
-            });
-        },
-
         /**
          * Override default options values settings with either URL query parameters or
          * initialized inputs values.

app/code/Magento/ProductVideo/view/frontend/web/js/fotorama-add-video-events.js

@@ -363,8 +363,7 @@ define([
                 t,
                 tmpVideoData,
                 currentItem,
-                iconClass = 'video-thumb-icon',
-                videoContainerClass = 'fotorama-video-container';
+                iconClass = 'video-thumb-icon';
 
             if (!fotorama.activeFrame.$navThumbFrame) {
                 $(this.element).on('fotorama:showend', $.proxy(function (evt, fotoramaData) {
@@ -379,7 +378,7 @@ define([
             thumbsParent = fotorama.activeFrame.$navThumbFrame.parent();
             thumbs = thumbsParent.find('.fotorama__nav__frame:visible');
 
-            fotorama.data.map($.proxy(function(item, i){
+            fotorama.data.map($.proxy(function (item, i) {
                 !item.type && (item.type = this.options.VideoData[i].mediaType);
             }, this));
 
@@ -449,7 +448,10 @@ define([
                 $image = fotorama.data[frameNumber - 1 + number];
 
             if ($image) {
-                if ($image.type !== 'video') return;
+
+                if ($image.type !== 'video') {
+                    return;
+                }
                 $image = $image.$stageFrame;
             }
 
@@ -620,6 +622,7 @@ define([
                 $(this).remove();
                 $item.append(cloneVideoDiv);
                 $item.addClass('video-unplayed');
+
                 if ($('.fotorama-item').data('fotorama').options.arrows) {
                     $('.fotorama__arr--next').show();
                     $('.fotorama__arr--prev').show();

app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js

@@ -6,9 +6,8 @@
 define([
     'jquery',
     'underscore',
-    'mage/gallery/preloadImages',
     'jquery/ui'
-], function ($, _, preloadImages) {
+], function ($, _) {
     'use strict';
 
     /**
@@ -272,27 +271,6 @@ define([
                     'img': $main.find('.product-image-photo').attr('src')
                 }];
             }
-            this._preloadSwatchesImages();
-        },
-
-        /**
-         * Preloads optional configuration images.
-         * @private
-         */
-        _preloadSwatchesImages: function () {
-            var options = this.options;
-
-            _.each(options.jsonConfig.images, function (array) {
-                var fullImagesList = [], 
-                    imagesList = [];
-
-                _.each(array, function (item) {
-                    imagesList.push(item.img);
-                    fullImagesList.push(item.full);
-                });
-                preloadImages(imagesList);
-                preloadImages(fullImagesList);
-            });
         },
 
         /**
@@ -915,7 +893,8 @@ define([
             var justAnImage = images[0],
                 updateImg,
                 imagesToUpdate,
-                gallery = context.find(this.options.mediaGallerySelector).data('gallery');
+                gallery = context.find(this.options.mediaGallerySelector).data('gallery'),
+                item;
 
             if (images) {
                 imagesToUpdate = this._setImageType($.extend(true, [], images));
@@ -927,11 +906,8 @@ define([
                         return img.isMain;
                     });
 
-                    if (updateImg.length) {
-                        gallery.updateDataByIndex(0, updateImg[0]);
-                    } else {
-                        gallery.updateDataByIndex(0, imagesToUpdate[0]);
-                    }
+                    item = updateImg.length ? updateImg[0]: imagesToUpdate[0];
+                    gallery.updateDataByIndex(0, item);
 
                     gallery.seek(1);
                 } else {