Merge pull request #16 from AnastasiiaXX/master

Author: keksobot

js/notifications.js

@@ -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;
@@ -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);