Skip to content
Draft
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
26 changes: 19 additions & 7 deletions src/project/types/website/listing/website-listing-read.ts
Original file line number Diff line number Diff line change
Expand Up @@ -393,14 +393,16 @@ export function completeListingItems(
debug(`[listing] Processing image match`);
const progressive = imgMatch[1] === "true";
const imgHeight = imgMatch[2];
const listingId = imgMatch[3];
const docRelativePath = imgMatch[4];
const lazy = imgMatch[3] !== "false";
const listingId = imgMatch[4];
const docRelativePath = imgMatch[5];
const docAbsPath = join(projectOutputDir(context), docRelativePath);
const imgPlaceholder = imagePlaceholder(
listingId,
docRelativePath,
progressive,
imgHeight,
lazy,
);
debug(`[listing] ${docAbsPath}`);
debug(`[listing] ${imgPlaceholder}`);
Expand Down Expand Up @@ -435,6 +437,7 @@ export function completeListingItems(
},
progressive,
imgHeight,
lazy,
);

debug(`[listing] replacing: ${docAbsPath}`);
Expand All @@ -454,7 +457,7 @@ export function completeListingItems(
};
fileContents = fileContents.replace(
imgPlaceholder,
imageSrc(imagePreview, progressive, imgHeight),
imageSrc(imagePreview, progressive, imgHeight, lazy),
);
} else {
debug(`[listing] using empty div: ${docAbsPath}`);
Expand Down Expand Up @@ -501,11 +504,14 @@ export function imagePlaceholder(
file: string,
progressive: boolean,
height?: string,
lazy?: boolean,
): string {
return file
? `<!-- img(9CEB782EFEE6)[progressive=${
progressive ? "true" : "false"
}, height=${height ? height : ""}]:${id}:${file} -->`
}, height=${height ? height : ""}, lazy=${
lazy === false ? "false" : "true"
}]:${id}:${file} -->`
: "";
}

Expand All @@ -517,7 +523,7 @@ const descriptionPlaceholderRegex =
/<!-- desc\(5A0113B34292\)\[max\=(.*)\]:(.*) -->/;

const imagePlaceholderRegex =
/<!-- img\(9CEB782EFEE6\)\[progressive\=(.*), height\=(.*)\]:(.*):(.*) -->/;
/<!-- img\(9CEB782EFEE6\)\[progressive\=(.*), height\=(.*), lazy\=(.*)\]:(.*):(.*) -->/;

function hydrateListing(
format: Format,
Expand Down Expand Up @@ -1202,8 +1208,14 @@ async function listItemFromFile(
}
}

function imageSrc(image: PreviewImage, progressive: boolean, height?: string) {
return `<p class="card-img-top"><img ${
function imageSrc(
image: PreviewImage,
progressive: boolean,
height?: string,
lazy?: boolean,
) {
const lazyAttr = lazy === false ? "" : "loading='lazy' ";
return `<p class="card-img-top"><img ${lazyAttr}${
progressive ? "data-src" : "src"
}="${image.src}" ${image.alt ? `alt="${image.alt}" ` : ""}${
height ? `style="height: ${height};" ` : ""
Expand Down
2 changes: 2 additions & 0 deletions src/project/types/website/listing/website-listing-template.ts
Original file line number Diff line number Diff line change
Expand Up @@ -447,13 +447,15 @@ export function reshapeListing(
listingId: string,
itemNumber: number,
itemPath: string,
lazy?: boolean,
) => {
const pageSize = listing[kPageSize];
return imagePlaceholder(
listingId,
itemPath,
itemNumber > pageSize,
listing[kImageHeight] as string,
lazy,
);
};

Expand Down
2 changes: 1 addition & 1 deletion src/resources/projects/website/listing/item-default.ejs.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ print(`<div class="metadata-value listing-${field}">${listing.utilities.outputLi
<% if (item.image) { %>
<%= listing.utilities.img(itemNumber, item.image, "thumbnail-image", item['image-alt'], item['image-lazy-loading'] ?? listing['image-lazy-loading']) %>
<% } else { %>
<%= listing.utilities.imgPlaceholder(listing.id, itemNumber, item.outputHref) %>
<%= listing.utilities.imgPlaceholder(listing.id, itemNumber, item.outputHref, item['image-lazy-loading'] ?? listing['image-lazy-loading']) %>
<% } %>
</a></div>
```
Expand Down
2 changes: 1 addition & 1 deletion src/resources/projects/website/listing/item-grid.ejs.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ return !["title", "image", "image-alt", "date", "author", "subtitle", "descripti
<% } else { %>

```{=html}
<%= listing.utilities.imgPlaceholder(listing.id, itemNumber, item.outputHref) %>
<%= listing.utilities.imgPlaceholder(listing.id, itemNumber, item.outputHref, item['image-lazy-loading'] ?? listing['image-lazy-loading']) %>
```

<% } %>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ if (field === "image") {
if (item.image) {
value = listing.utilities.img(itemNumber, item[field], "", item['image-alt'], item['image-lazy-loading'] ?? listing['image-lazy-loading']);
} else {
value = listing.utilities.imgPlaceholder(listing.id, itemNumber, item.outputHref);
value = listing.utilities.imgPlaceholder(listing.id, itemNumber, item.outputHref, item['image-lazy-loading'] ?? listing['image-lazy-loading']);
}
}
return listing.utilities.outputLink(item, field, value, `listing-${field}`);
Expand Down
Loading