Skip to content

Fixes #1298 - Icons do not display when the svg is loaded from a file:// URL in Safari #1299

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

Closed
sthompson-crestron wants to merge 1 commit into from
Closed

Fixes #1298 - Icons do not display when the svg is loaded from a file:// URL in Safari #1299

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
20 changes: 11 additions & 9 deletions src/components/icon/request.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,15 +32,17 @@ export const getSvgContent = (url: string, sanitize: boolean) => {
} else {
// we don't already have a request
req = fetch(url).then((rsp) => {
if (rsp.ok) {
return rsp.text().then((svgContent) => {
if (svgContent && sanitize !== false) {
svgContent = validateContent(svgContent);
}
ioniconContent.set(url, svgContent || '');
});
}
ioniconContent.set(url, '');
// When fetching from a file:// URL, some browsers return
// a 0 status code even when the request succeeds so don't
// rely on rsp.ok as the only signal of success.
return rsp.text().then((svgContent) => {
if (svgContent && sanitize !== false) {
svgContent = validateContent(svgContent);
}
ioniconContent.set(url, svgContent || '');
}).catch((_) => {
ioniconContent.set(url, '');
});
});
// cache for the same requests
requests.set(url, req);
Expand Down