Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Patch 18017 magento 23 #19635

Merged
merged 9 commits into from
Mar 14, 2019
Merged

Patch 18017 magento 23 #19635

Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b92bbc4
Fixed-#18017 magento 2.3
Dec 8, 2018
95d5f44
Fixed Code Improovement
Dec 8, 2018
30c3eac
Code Improovement and changes as suggested
Dec 10, 2018
ee64ecd
code changes as per PSR4
Dec 10, 2018
7feaedd
Code Improvement suggested by orlangur
Dec 28, 2018
bbceaab
resolve conflicts
Jan 8, 2019
0611394
reolve comflict and remove unncessary code using compare with magento…
Feb 6, 2019
41c2d90
Merge branch '2.3-develop' into patch-18017-magento-23
niravkrish Feb 7, 2019
ec5c01f
Merge branch '2.3-develop' into patch-18017-magento-23
niravkrish Feb 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions app/code/Magento/Swatches/view/frontend/web/js/swatch-renderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1223,7 +1223,14 @@ define([
}

imagesToUpdate = this._setImageIndex(imagesToUpdate);
gallery.updateData(imagesToUpdate);
if (gallery === undefined) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Such check is not correct, please use typeof instead.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I will update the code.
Please review It.

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();
Expand All @@ -1234,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);
Expand Down