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

Guard against missing currentGallery element #124

Merged
merged 2 commits into from
Oct 25, 2016
Merged

Guard against missing currentGallery element #124

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96a99ad
Guard against missing currentGallery element
rgalanakis Aug 29, 2016
7674cbd
Refactor loadImage early outs, add comment.
rgalanakis Oct 24, 2016
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
8 changes: 6 additions & 2 deletions src/baguetteBox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,11 @@

function loadImage(index, callback) {
var imageContainer = imagesElements[index];
if (typeof imageContainer === 'undefined') {
var galleryItem = currentGallery[index];

// Return if the index exceeds prepared images in the overlay
// or if the current gallery has been changed / closed
if (imageContainer === undefined || galleryItem === undefined) {
return;
}

Expand All @@ -485,7 +489,7 @@
}

// Get element reference, optional caption and source path
var imageElement = currentGallery[index].imageElement;
var imageElement = galleryItem.imageElement;
var thumbnailElement = imageElement.getElementsByTagName('img')[0];
var imageCaption = typeof options.captions === 'function' ?
options.captions.call(currentGallery, imageElement) :
Expand Down