Skip to content

Fix Welcome Modal Rerendering #8

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
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix Welcome Modal Rerendering #8

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
86 changes: 35 additions & 51 deletions src/layout/disclaimer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,25 @@
import { lockTabKey } from "../utils/keydown-helpers.js";
import { closeSound } from "../utils/sounds.js";

const disclaimer = document.createElement('div');
disclaimer.id = 'disclaimer';
disclaimer.setAttribute('role', 'alert');
disclaimer.setAttribute('aria-label', 'Disclaimer');
function hasSeenDisclaimer() {
return localStorage.getItem("hasSeenDisclaimer") === "true";
}

const message = document.createElement('p');
function markDisclaimerAsSeen() {
localStorage.setItem("hasSeenDisclaimer", "true");
}

const disclaimer = document.createElement("div");
disclaimer.id = "disclaimer";
disclaimer.setAttribute("role", "alert");
disclaimer.setAttribute("aria-label", "Disclaimer");

const message = document.createElement("p");
message.setAttribute("tabindex", 1);
message.setAttribute("aria-atom","true");
message.id = 'messagec';
const messageContainer = document.createElement('div');
messageContainer.id='message';
message.setAttribute("aria-atom", "true");
message.id = "messagec";
const messageContainer = document.createElement("div");
messageContainer.id = "message";
message.innerHTML = `<p>
<strong>Welcome to World-Map-Explorer</strong><br><br>
Please note the following:<br>
Expand All @@ -35,54 +43,30 @@ message.innerHTML = `<p>
Thank you for using World-Map-Explorer!
</p>`;

const closeButton = document.createElement('button');
closeButton.id = 'close-button';
closeButton.setAttribute('aria-label', 'Close Disclaimer');
closeButton.textContent = 'X';
const closeButton = document.createElement("button");
closeButton.id = "close-button";
closeButton.setAttribute("aria-label", "Close Disclaimer");
closeButton.textContent = "X";

const lockTabKeyRefer = (event) => lockTabKey(event, message, closeButton);

const lockTabKeyRefer = (event)=> lockTabKey(event, message, closeButton)

closeButton.addEventListener('click', () => {
document.removeEventListener('keydown', lockTabKeyRefer);
closeButton.addEventListener("click", () => {
document.removeEventListener("keydown", lockTabKeyRefer);
disclaimer.remove();
closeSound.play()
closeSound.play();
markDisclaimerAsSeen();
});
message.appendChild(closeButton);

messageContainer.appendChild(message);
disclaimer.appendChild(messageContainer);

export function addDisclaimer(){
document.body.prepend(disclaimer);

document.addEventListener('keydown', lockTabKeyRefer);
// disclaimer part ends
window.onload = function () {
message.focus();
export function addDisclaimer() {
if (!hasSeenDisclaimer()) {
document.body.prepend(disclaimer);
document.addEventListener("keydown", lockTabKeyRefer);
window.onload = function () {
message.focus();
};
}
}
























}