Skip to content

remove nested fucntions #16

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

Merged
keksobot merged 1 commit into from
May 26, 2026
Merged

remove nested fucntions #16

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
46 changes: 24 additions & 22 deletions js/notifications.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,28 @@ const ERROR_SHOW_TIME = 5000;
const dataErrorTemplate = document.querySelector('#data-error');
const body = document.querySelector('body');

let messageDiv = null;
let messageButton = null;

const closeMessage = () => {
messageDiv.remove();
document.removeEventListener('keydown', handleKeydown, true);
messageButton.removeEventListener('click', closeMessage);
messageDiv.removeEventListener('click', handleOverlayClick);
};

function handleKeydown(evt) {
evt.stopPropagation();
if (isEscapeKey(evt)) {
closeMessage();
}
}

function handleOverlayClick(evt) {
if (evt.target === messageDiv) {
closeMessage();
}
}
const showDataError = () => {
const template = dataErrorTemplate.content.cloneNode(true);
const errorDiv = template.firstElementChild;
Expand All @@ -16,30 +38,10 @@ const showDataError = () => {

const showMessage = (templateId, buttonClass) => {
const template = document.querySelector(templateId).content.cloneNode(true);
const messageDiv = template.firstElementChild;
const messageButton = messageDiv.querySelector(buttonClass);
messageDiv = template.firstElementChild;
messageButton = messageDiv.querySelector(buttonClass);
body.append(template);

const closeMessage = () => {
messageDiv.remove();
document.removeEventListener('keydown', handleKeydown, true);
messageButton.removeEventListener('click', closeMessage);
messageDiv.removeEventListener('click', handleOverlayClick);
};

function handleKeydown(evt) {
evt.stopPropagation();
if (isEscapeKey(evt)) {
closeMessage();
}
}

function handleOverlayClick(evt) {
if (evt.target === messageDiv) {
closeMessage();
}
}

messageButton.addEventListener('click', closeMessage);
document.addEventListener('keydown', handleKeydown, true);
messageDiv.addEventListener('click', handleOverlayClick);
Expand Down
Loading