Merge pull request #21 from bessaliy/master

Author: keksobot

js/form.js

@@ -16,6 +16,11 @@ const errorElement = sendErrorTemplate.content.cloneNode(true);
 const errorModal = errorElement.querySelector('.error');
 const errorButton = errorModal.querySelector('.error__button');
 
+let successShown = false;
+let errorShown = false;
+let shouldCloseForm = true;
+
+
 const blockSubmitButton = () => {
   submitButton.disabled = true;
   submitButton.textContent = 'Публикую...';
@@ -28,7 +33,7 @@ const unblockSubmitButton = () => {
 
 const changeEventListeners = (action) => {
   const method = `${action}EventListener`;
-  document[method]('keydown', onEscPress);
+  document[method]('keydown', onHandleEscapeKey);
   document[method]('click', onOutsideClick);
 };
 
@@ -40,6 +45,7 @@ const onCloseSuccessModal = () => {
 const onCloseErrorModal = () => {
   errorModal.remove();
   changeEventListeners('remove');
+  shouldCloseForm = true;
 };
 
 const switchForm = (param1, param2) => {
@@ -51,33 +57,39 @@ const onCloseForm = () => {
   switchForm('add', 'remove');
   resetForm();
 };
-
-const onHandleEscapeKey = (evt) => {
+function onHandleEscapeKey(evt) {
   if (evt.key === 'Escape') {
+
     const excludedFields = [hashtagField, commentField];
     const activeElement = document.activeElement;
+    shouldCloseForm = true;
 
-    let shouldClose = true;
     excludedFields.forEach((field) => {
       if (field === activeElement) {
-        shouldClose = false;
+        shouldCloseForm = false;
       }
     });
 
-    if (shouldClose) {
-      onCloseForm();
+    if (errorShown) {
+      shouldCloseForm = false;
+      errorShown = false;
+      onCloseErrorModal();
+      document.addEventListener('keydown', onHandleEscapeKey);
+      return;
     }
-  }
-};
 
-function onEscPress(evt) {
-  if (evt.key === 'Escape') {
+    if (successShown) {
+      onCloseSuccessModal();
+    }
 
-    onCloseSuccessModal();
-    onCloseErrorModal();
+    if (shouldCloseForm) {
+      onCloseForm();
+    }
   }
+  shouldCloseForm = true;
 }
 
+
 function onOutsideClick(evt) {
   if (!evt.target.closest('.success__inner')) {
     onCloseSuccessModal();
@@ -112,7 +124,6 @@ function resetForm() {
   }
 }
 
-
 formOpener.addEventListener('click', () => {
   switchForm('remove', 'add');
 });
@@ -182,13 +193,14 @@ const showSuccessMessage = () => {
 
   successButton.addEventListener('click', onCloseSuccessModal);
   changeEventListeners('add');
+  successShown = true;
 };
 
 const showErrorMessage = () => {
   document.body.appendChild(errorModal);
-
   errorButton.addEventListener('click', onCloseErrorModal);
   changeEventListeners('add');
+  errorShown = true;
 };
 
 form.addEventListener('submit', async (evt) => {
@@ -224,7 +236,6 @@ form.addEventListener('submit', async (evt) => {
 });
 
 formCloseBtn.addEventListener('click', onCloseForm);
-document.addEventListener('keydown', onHandleEscapeKey);
 
 const cancelButton = document.querySelector('.img-upload__cancel');
 if (cancelButton) {

js/picture-from-api.js

@@ -1,11 +1,10 @@
 import { photoTemplate, errorTemplate } from './templates.js';
 import {getData, Method, Route, ErrorText} from './api.js';
 
-export const container = document.querySelector('.pictures');
-const photosTotal = [];
-
 const COMMENTS_ON_SHOW = 5;
 
+export const container = document.querySelector('.pictures');
+const photosTotal = [];
 const openBigPicture = document.querySelector('.big-picture');
 const bigPicture = document.querySelector('.big-picture__img');
 const closeBigPicture = document.querySelector('.big-picture__cancel');