Merge pull request #79 from AnastasiaBuniakEPAM/JS-323

JS-337: [Configurable.JS] Preload all needed images
magento · Dec 22, 2015 · 39aa50f · 39aa50f
2 parents e8b7b00 + 2d7afe6
commit 39aa50f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 111 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
@@ -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.

diff --git a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js b/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,24 +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 imagesList = [];
-
-                _.each(array, function (item) {
-                    imagesList.push(item.img);
-                });
-                preloadImages(imagesList);
-            });
         },
 
         /**

diff --git a/lib/web/mage/gallery/preloadImages.js b/lib/web/mage/gallery/preloadImages.js