Skip to content
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

Fixed bugs in sha-inv page on favicon #66

Merged
merged 4 commits into from
Nov 6, 2024
Merged

Fixed bugs in sha-inv page on favicon #66

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0d58e85
fix: favicon find func
Vldln Oct 11, 2024
7f80bf7
fix: typo
Vldln Oct 11, 2024
39da70c
fix: favicon js code
Vldln Oct 11, 2024
a0277b1
Fix getFavicon
jeremy5189 Nov 6, 2024
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: 23 additions & 3 deletions internal/sha-inverse-challenge.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,27 @@
return selectedMessage;
}

function getFavicon(imgElement) {
// Build the base URL in a backward-compatible way
var origin = window.location.protocol + "//" + window.location.host;
var faviconUrl = origin + '/favicon.ico';
var fallbackSvg = imgElement.src;
var testImage = new Image();

testImage.src = faviconUrl

// Set favicon if it loads successfully
testImage.addEventListener('load', function() {
imgElement.src = faviconUrl;
});

// Fallback to SVG if favicon fails to load
testImage.addEventListener('error', function() {
console.log('Favicon not found, falling back to SVG');
imgElement.src = fallbackSvg;
});
}

function setDomainName() {
document.getElementsByClassName("website-title")[0].textContent =
window.location.hostname;
Expand All @@ -182,8 +203,7 @@
}

function setFavicon() {
document.getElementsByClassName("website-favicon")[0].src =
window.location.origin + '/favicon.ico';
getFavicon(document.getElementsByClassName("website-favicon")[0])
}
</script>
<style>
Expand Down Expand Up @@ -287,7 +307,7 @@
<h1 class="js-alert">Please turn on JavaScript and reload the page.</h1>
</noscript>
<div class="website">
<img class="website-favicon" src="https://deflect.ca/favicon.ico" onerror="this.style.display='none'"/>
<img class="website-favicon" src="data:image/svg+xml;charset=UTF-8,%3Csvg%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20width%3D%2232%22%20height%3D%2232%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%3E%3Ccircle%20cx%3D%2212%22%20cy%3D%2212%22%20r%3D%2210%22%20stroke%3D%22%23333%22%20stroke-width%3D%221.5%22%20fill%3D%22%23cce5ff%22%2F%3E%3Cpath%20d%3D%22M12%202c3%202%205%205.5%205%2010s-2%208-5%2010c-3-2-5-5.5-5-10s2-8%205-10Z%22%20stroke%3D%22%23333%22%20stroke-width%3D%221%22%20fill%3D%22none%22%2F%3E%3Cpath%20d%3D%22M2%2012h20M12%202v20%22%20stroke%3D%22%23333%22%20stroke-width%3D%221%22%20stroke-linecap%3D%22round%22%2F%3E%3C%2Fsvg%3E" onerror="this.style.display='none'"/>
<span class="website-title"></span>
</div>
<div class="loader">
Expand Down
Loading