Merge pull request #16 from Vitali3207/master

Author: keksobot

js/form/image-form.js

@@ -1,6 +1,6 @@
 import { isEscapeKey } from '../util';
 import { initScale, resetScale } from './image-scale';
-import { initValidation, validateForm } from './validation';
+import { validateForm } from './validation';
 import { initEffect, resetEffect } from './slider-effect';
 import { sendData } from '../load-data';
 import { generateErrorMessage, showSuccessMessage, showErrorMessage, hasErrorMessage, closeMessage } from '../messages';
@@ -17,16 +17,18 @@ const preview = document.querySelector('.img-upload__preview img');
 const uploadFormEffects = uploadForm.querySelectorAll('.effects__preview');
 
 const onEscKeyDown = (evt) => {
-  if (isEscapeKey(evt) && (document.activeElement === hashtagsInput || document.activeElement === descriptionInput)) {
-    return;
-  }
+  if (isEscapeKey(evt)) {
+    if (document.activeElement === hashtagsInput || document.activeElement === descriptionInput) {
+      return;
+    }
 
-  if(hasErrorMessage()) {
-    closeMessage();
-    return;
-  }
+    if (hasErrorMessage()) {
+      closeMessage();
+      return;
+    }
 
-  closeUploadModal();
+    closeUploadModal();
+  }
 };
 
 const onUploadCancelClick = () => {
@@ -36,7 +38,7 @@ const onUploadCancelClick = () => {
 function closeUploadModal () {
   formOverlay.classList.add('hidden');
   document.querySelector('body').classList.remove('modal-open');
-  document.removeEventListener('keydown', onEscKeyDown);
+  document.body.removeEventListener('keydown', onEscKeyDown);
   buttonCloseUpload.removeEventListener('click', onUploadCancelClick);
 
   resetEffect();
@@ -52,7 +54,6 @@ const openUploadModal = () => {
 
   initEffect();
   initScale();
-  initValidation();
 };
 
 function onFileChooserChange () {

js/main.js

@@ -4,6 +4,7 @@ import { renderThumbnails } from './render-thumbnails';
 import { setPicturesListener } from './big-picture';
 import { initUploadModal } from './form/image-form';
 import { initFilter } from './filter.js';
+import { initValidation } from './form/validation';
 
 const bootstrap = async () => {
   try {
@@ -12,7 +13,8 @@ const bootstrap = async () => {
     setPicturesListener(photos);
     initFilter(photos);
     initUploadModal();
-  }catch(error) {
+    initValidation();
+  } catch(error) {
     generateErrorMessage();
   }
 };

js/messages.js

@@ -28,23 +28,21 @@ const generateErrorMessage = (message) => {
 const closeMessage = () => {
   if (successMessageContainer) {
     successMessageContainer.remove();
-    return;
   }
 
   if(errorMessageContainer) {
     errorMessageContainer.remove();
-    return;
   }
 
+  document.removeEventListener('keydown', onEscKeyDownMessage);
   document.body.removeEventListener('click', onBodyCancelClick);
-  document.body.removeEventListener('keydown', onEscKeyDownMessage);
   errorMessageContainer = null;
   successMessageContainer = null;
 };
 
 
-const onMessageCloseButton = (container) => {
-  container.remove();
+const onMessageCloseButton = () => {
+  closeMessage();
 };
 
 function onEscKeyDownMessage (evt) {
@@ -67,7 +65,7 @@ const showPopupMessage = (node) => {
   document.body.append(node);
   button.addEventListener('click', () => onMessageCloseButton(node));
   document.body.addEventListener('click', onBodyCancelClick);
-  document.body.addEventListener('keydown', onEscKeyDownMessage);
+  document.addEventListener('keydown', onEscKeyDownMessage);
 };
 
 const showSuccessMessage = () => {

js/render-thumbnails.js

@@ -5,14 +5,14 @@ const renderThumbnails = (userPhotos) => {
   usersPhotoList.querySelectorAll('.picture').forEach((photo) => photo.remove());
   const photoFragment = document.createDocumentFragment();
 
-  userPhotos.forEach((photo) => {
+  userPhotos.forEach(({id, url, description, comments, likes}) => {
     const photoElement = thumbnails.cloneNode(true);
 
-    photoElement.dataset.pictureId = photo.id;
-    photoElement.querySelector('.picture__img').src = photo.url;
-    photoElement.querySelector('.picture__img').alt = photo.description;
-    photoElement.querySelector('.picture__comments').textContent = photo.comments.length;
-    photoElement.querySelector('.picture__likes').textContent = photo.likes;
+    photoElement.dataset.pictureId = id;
+    photoElement.querySelector('.picture__img').src = url;
+    photoElement.querySelector('.picture__img').alt = description;
+    photoElement.querySelector('.picture__comments').textContent = comments.length;
+    photoElement.querySelector('.picture__likes').textContent = likes;
 
     photoFragment.append(photoElement);
   });