Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 14 additions & 5 deletions demo-docs-website/static/photoswipe/photoswipe-lightbox.esm.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

19 changes: 14 additions & 5 deletions demo-docs-website/static/photoswipe/photoswipe.esm.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion demo-docs-website/static/photoswipe/photoswipe.esm.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions demo-docs-website/static/photoswipe/photoswipe.esm.min.js

Large diffs are not rendered by default.

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions demo-docs-website/static/photoswipe/umd/photoswipe.umd.min.js

Large diffs are not rendered by default.

19 changes: 14 additions & 5 deletions dist/photoswipe-lightbox.esm.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/photoswipe-lightbox.esm.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/photoswipe-lightbox.esm.min.js

Large diffs are not rendered by default.

19 changes: 14 additions & 5 deletions dist/photoswipe.esm.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/photoswipe.esm.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/photoswipe.esm.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/umd/photoswipe-lightbox.umd.min.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/umd/photoswipe.umd.min.js

Large diffs are not rendered by default.

17 changes: 13 additions & 4 deletions src/js/core/base.js
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,19 @@ class PhotoSwipeBase extends Eventable {
itemData.srcset = linkEl.dataset.pswpSrcset;
}

itemData.width = linkEl.dataset.pswpWidth ? parseInt(linkEl.dataset.pswpWidth, 10) : 0;
itemData.height = linkEl.dataset.pswpHeight ? parseInt(linkEl.dataset.pswpHeight, 10) : 0;
const thumbnailEl = element.querySelector('img');
// set itemData.w & itemData.h with naturalWidth & naturalHeight by default
itemData.width = thumbnailEl?.naturalWidth;
itemData.height = thumbnailEl?.naturalHeight;

// if pswp-width & pswp-height are defined, replace naturalWidth & naturalHeight with the defined pswp data
if (linkEl.dataset.pswpWidth) {
itemData.width = parseInt(linkEl.dataset.pswpWidth, 10);
}

if (linkEl.dataset.pswpHeight) {
itemData.height = parseInt(linkEl.dataset.pswpHeight, 10);
}

// support legacy w & h properties
itemData.w = itemData.width;
Expand All @@ -154,8 +165,6 @@ class PhotoSwipeBase extends Eventable {
itemData.type = linkEl.dataset.pswpType;
}

const thumbnailEl = element.querySelector('img');

if (thumbnailEl) {
// msrc is URL to placeholder image that's displayed before large image is loaded
// by default it's displayed only for the first slide
Expand Down