Skip to content

added natural image height and width without defined it with data-psw… #2048

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

Open
spoitler wants to merge 1 commit into
base: master
Choose a base branch
from
Open

added natural image height and width without defined it with data-psw… #2048

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 13 additions & 4 deletions src/js/core/base.js
View file
Open in desktop
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