From b92bbc41c6f76e50b02922067d3df208501a56f6 Mon Sep 17 00:00:00 2001 From: niravkrish Date: Sat, 8 Dec 2018 12:00:48 +0530 Subject: [PATCH 1/7] Fixed-#18017 magento 2.3 --- .../Swatches/view/frontend/web/js/swatch-renderer.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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 index 0a8675067ea5d..cfb29b27bdef4 100644 --- a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js +++ b/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js @@ -1223,7 +1223,15 @@ define([ } imagesToUpdate = this._setImageIndex(imagesToUpdate); - gallery.updateData(imagesToUpdate); + + if (gallery === undefined) { + context.find(this.options.mediaGallerySelector).on('gallery:loaded', function (loadedGallery) { + loadedGallery = context.find(this.options.mediaGallerySelector).data('gallery'); + loadedGallery.updateData(imagesToUpdate); + }.bind(this)); + } else { + gallery.updateData(imagesToUpdate); + } if (isInitial) { $(this.options.mediaGallerySelector).AddFotoramaVideoEvents(); From 95d5f44f6654a3db1ad6eb2b0b17b007f67bc3de Mon Sep 17 00:00:00 2001 From: niravkrish Date: Sat, 8 Dec 2018 18:06:04 +0530 Subject: [PATCH 2/7] Fixed Code Improovement --- .../Swatches/view/frontend/web/js/swatch-renderer.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) 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 index cfb29b27bdef4..77c1f208f68c9 100644 --- a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js +++ b/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js @@ -1223,7 +1223,6 @@ define([ } imagesToUpdate = this._setImageIndex(imagesToUpdate); - if (gallery === undefined) { context.find(this.options.mediaGallerySelector).on('gallery:loaded', function (loadedGallery) { loadedGallery = context.find(this.options.mediaGallerySelector).data('gallery'); @@ -1242,7 +1241,14 @@ define([ }); } - gallery.first(); + if (gallery === undefined) { + context.find(this.options.mediaGallerySelector).on('gallery:loaded', function (loadedGallery) { + loadedGallery = context.find(this.options.mediaGallerySelector).data('gallery'); + loadedGallery.first(); + }.bind(this)); + } else { + gallery.first(); + } } else if (justAnImage && justAnImage.img) { context.find('.product-image-photo').attr('src', justAnImage.img); From 30c3eac83641969f6a38fdf1f52eac903520ea52 Mon Sep 17 00:00:00 2001 From: niravkrish Date: Mon, 10 Dec 2018 10:02:27 +0530 Subject: [PATCH 3/7] Code Improovement and changes as suggested --- .../Magento/Swatches/view/frontend/web/js/swatch-renderer.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 index 77c1f208f68c9..45cd85b32d579 100644 --- a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js +++ b/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js @@ -1223,7 +1223,7 @@ define([ } imagesToUpdate = this._setImageIndex(imagesToUpdate); - if (gallery === undefined) { + if (typeof gallery === undefined) { context.find(this.options.mediaGallerySelector).on('gallery:loaded', function (loadedGallery) { loadedGallery = context.find(this.options.mediaGallerySelector).data('gallery'); loadedGallery.updateData(imagesToUpdate); @@ -1241,7 +1241,7 @@ define([ }); } - if (gallery === undefined) { + if (typeof gallery === undefined) { context.find(this.options.mediaGallerySelector).on('gallery:loaded', function (loadedGallery) { loadedGallery = context.find(this.options.mediaGallerySelector).data('gallery'); loadedGallery.first(); From ee64ecdf5e03deae2aa8734892cd51aff398543c Mon Sep 17 00:00:00 2001 From: niravkrish Date: Mon, 10 Dec 2018 10:35:24 +0530 Subject: [PATCH 4/7] code changes as per PSR4 --- .../Magento/Swatches/view/frontend/web/js/swatch-renderer.js | 1 + 1 file changed, 1 insertion(+) 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 index 45cd85b32d579..8b8b76accd12f 100644 --- a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js +++ b/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js @@ -1223,6 +1223,7 @@ define([ } imagesToUpdate = this._setImageIndex(imagesToUpdate); + if (typeof gallery === undefined) { context.find(this.options.mediaGallerySelector).on('gallery:loaded', function (loadedGallery) { loadedGallery = context.find(this.options.mediaGallerySelector).data('gallery'); From 7feaeddc33995e2a0abe121e24854e02d7bb83f7 Mon Sep 17 00:00:00 2001 From: niravkrish Date: Fri, 28 Dec 2018 13:03:55 +0530 Subject: [PATCH 5/7] Code Improvement suggested by orlangur --- .../Magento/Swatches/view/frontend/web/js/swatch-renderer.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 index 8b8b76accd12f..3261f8fcf96e6 100644 --- a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js +++ b/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js @@ -1224,7 +1224,7 @@ define([ imagesToUpdate = this._setImageIndex(imagesToUpdate); - if (typeof gallery === undefined) { + if (typeof gallery == 'undefined') { context.find(this.options.mediaGallerySelector).on('gallery:loaded', function (loadedGallery) { loadedGallery = context.find(this.options.mediaGallerySelector).data('gallery'); loadedGallery.updateData(imagesToUpdate); @@ -1242,7 +1242,7 @@ define([ }); } - if (typeof gallery === undefined) { + if (typeof gallery == 'undefined') { context.find(this.options.mediaGallerySelector).on('gallery:loaded', function (loadedGallery) { loadedGallery = context.find(this.options.mediaGallerySelector).data('gallery'); loadedGallery.first(); From bbceaab96e7f9440528944a41d141e78ee6c3b26 Mon Sep 17 00:00:00 2001 From: niravkrish Date: Tue, 8 Jan 2019 10:45:52 +0530 Subject: [PATCH 6/7] resolve conflicts --- .../Magento/Swatches/view/frontend/web/js/swatch-renderer.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 index 3261f8fcf96e6..3693f86984602 100644 --- a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js +++ b/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js @@ -1224,7 +1224,7 @@ define([ imagesToUpdate = this._setImageIndex(imagesToUpdate); - if (typeof gallery == 'undefined') { + if (typeof gallery === 'undefined') { context.find(this.options.mediaGallerySelector).on('gallery:loaded', function (loadedGallery) { loadedGallery = context.find(this.options.mediaGallerySelector).data('gallery'); loadedGallery.updateData(imagesToUpdate); @@ -1242,7 +1242,7 @@ define([ }); } - if (typeof gallery == 'undefined') { + if (typeof gallery === 'undefined') { context.find(this.options.mediaGallerySelector).on('gallery:loaded', function (loadedGallery) { loadedGallery = context.find(this.options.mediaGallerySelector).data('gallery'); loadedGallery.first(); From 06113942bfd95b25efd94c2f3626526549aade1a Mon Sep 17 00:00:00 2001 From: niravkrish Date: Wed, 6 Feb 2019 15:25:56 +0530 Subject: [PATCH 7/7] reolve comflict and remove unncessary code using compare with magento 2 core file --- .../Swatches/view/frontend/web/js/swatch-renderer.js | 9 --------- 1 file changed, 9 deletions(-) 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 index 3693f86984602..220b06fea1dc0 100644 --- a/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js +++ b/app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js @@ -1242,15 +1242,6 @@ define([ }); } - if (typeof gallery === 'undefined') { - context.find(this.options.mediaGallerySelector).on('gallery:loaded', function (loadedGallery) { - loadedGallery = context.find(this.options.mediaGallerySelector).data('gallery'); - loadedGallery.first(); - }.bind(this)); - } else { - gallery.first(); - } - } else if (justAnImage && justAnImage.img) { context.find('.product-image-photo').attr('src', justAnImage.img); }