Skip to content

Commit 24bcd71

Browse files
committed
微修正
1 parent dbe2362 commit 24bcd71

File tree

1 file changed

+13
-15
lines changed

1 file changed

+13
-15
lines changed

src/fetch/index.ts

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,24 +33,12 @@ previewElement?.addEventListener("interest", async (event: InterestEvent) => {
3333
const image = doc.querySelector(`meta[property="og:image"]`)?.getAttribute("content") || "";
3434

3535
if (previewElement && previewImageElement && previewTitleElement && previewDescriptionElement) {
36+
// 画像の読み込みが完了するまで待つ
37+
await awaitImageLoad(image);
38+
previewImageElement.src = image;
3639
previewTitleElement.textContent = title;
3740
previewDescriptionElement.textContent = description;
3841

39-
// 画像の読み込みが完了するまで待つ
40-
if (image) {
41-
await new Promise<void>((resolve) => {
42-
const img = new Image();
43-
img.onload = () => {
44-
previewImageElement.src = image;
45-
return resolve();
46-
};
47-
img.src = image;
48-
});
49-
} else {
50-
console.log("画像がありません");
51-
previewImageElement.src = "";
52-
}
53-
5442
// OGPデータの取得が完了したらプレビューを表示
5543
previewElement?.showPopover?.();
5644
}
@@ -68,3 +56,13 @@ previewElement?.addEventListener("loseinterest", async () => {
6856
previewElement?.hidePopover?.();
6957
}
7058
});
59+
60+
const awaitImageLoad = async (image: string) => {
61+
return new Promise<void>((resolve) => {
62+
const img = new Image();
63+
img.onload = () => {
64+
return resolve();
65+
};
66+
img.src = image;
67+
});
68+
};

0 commit comments

Comments
 (0)