Merge pull request #457 from favicode/bugfix/js-validation-on-pdp

Bugfix/js validation on pdp

Author: vvuksan

Diff for: view/frontend/web/js/gallery/gallery-mixin.js

@@ -7,8 +7,10 @@ define([
     return function (gallery) {
 
         return wrapper.wrap(gallery, function (initialize, config, element) {
+            if (_.isUndefined(config) || _.isEmpty(config))
+                return initialize(config, element);
 
-            if (_.isUndefined(config.data))
+            if (_.isUndefined(config.data) || _.isEmpty(config.data))
                 return initialize(config, element);
 
             let wdpr = window.devicePixelRatio;

Diff for: view/frontend/web/js/swatch-renderer-mixin.js

@@ -1,34 +1,41 @@
 define([
-    'mage/utils/wrapper',
+    'jquery',
     'underscore'
-], function (wrapper, _) {
+], function ($, _) {
     'use strict';
 
     return function (swatchRenderer) {
 
-        return wrapper.wrap(swatchRenderer, function (create, config, element) {
+        $.widget('mage.SwatchRenderer', swatchRenderer, {
+            
+            _init: function () {
+                if (_.isUndefined(this.options) || _.isEmpty(this.options))
+                        return this._super();
 
-            if (_.isUndefined(config.jsonConfig))
-                return create(config, element);
+                if (_.isUndefined(this.options.jsonConfig) || _.isEmpty(this.options.jsonConfig))
+                    return this._super();
 
-            if (_.isUndefined(config.jsonConfig.images))
-                return create(config, element);
+                if (_.isUndefined(this.options.jsonConfig.images) || _.isEmpty(this.options.jsonConfig.images))
+                    return this._super();
 
-            let wdpr = window.devicePixelRatio;
+                let wdpr = window.devicePixelRatio;
 
-            _.each(config.jsonConfig.images, function (images) {
-                _.each(images, function (imageObject) {
-                    if (_.isUndefined(imageObject.fastly_srcset))
-                        return;
+                _.each(this.options.jsonConfig.images, function (images) {
+                    _.each(images, function (imageObject) {
+                        if (_.isUndefined(imageObject.fastly_srcset))
+                            return;
 
-                    if (!_.has(imageObject.fastly_srcset, wdpr))
-                        return;
+                        if (!_.has(imageObject.fastly_srcset, wdpr))
+                            return;
 
-                    imageObject.img = imageObject.fastly_srcset[wdpr];
+                        imageObject.img = imageObject.fastly_srcset[wdpr];
+                    });
                 });
-            });
 
-            create(config, element);
+                return this._super();
+            }
         });
+
+        return $.mage.SwatchRenderer;
     };
-});
+});