Merge pull request #15 from Vitali3207/master

Author: keksobot

js/big-picture.js

@@ -1,5 +1,7 @@
 import { isEscapeKey } from './util';
 
+const COMMENTS_STEP = 5;
+
 const usersPhotoList = document.querySelector('.pictures');
 const bigPicture = document.querySelector('.big-picture');
 const bigPictureImage = bigPicture.querySelector('.big-picture__img img');
@@ -13,7 +15,6 @@ const buttonLoader = document.querySelector('.comments-loader');
 const buttonClose = document.querySelector('.big-picture__cancel');
 socialComments.innerHTML = '';
 
-const COMMENTS_STEP = 5;
 let commentCount = 0;
 let currentComments = [];
 

js/form/image-form.js

@@ -3,7 +3,7 @@ import { initScale, resetScale } from './image-scale';
 import { initValidation, validateForm } from './validation';
 import { initEffect, resetEffect } from './slider-effect';
 import { sendData } from '../load-data';
-import { generateErrorMessage, showSuccessMessage, showErrorMessage, hasErrorMessage } from '../messages';
+import { generateErrorMessage, showSuccessMessage, showErrorMessage, hasErrorMessage, closeMessage } from '../messages';
 
 const FILE_TYPES = ['.jpg', '.jpeg', '.png', '.gif'];
 
@@ -12,14 +12,21 @@ const formOverlay = uploadForm.querySelector('.img-upload__overlay');
 const buttonCloseUpload = uploadForm.querySelector('.img-upload__cancel');
 const hashtagsInput = uploadForm.querySelector('.text__hashtags');
 const descriptionInput = uploadForm.querySelector('.text__description');
-const fileChooser = document.querySelector('.img-upload__wrapper input[type=file]');
+const fileChooser = document.querySelector('.img-upload__input');
 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) && !hasErrorMessage()) {
-    closeUploadModal();
+  if (isEscapeKey(evt) && (document.activeElement === hashtagsInput || document.activeElement === descriptionInput)) {
+    return;
   }
+
+  if(hasErrorMessage()) {
+    closeMessage();
+    return;
+  }
+
+  closeUploadModal();
 };
 
 const onUploadCancelClick = () => {
@@ -28,7 +35,7 @@ const onUploadCancelClick = () => {
 
 function closeUploadModal () {
   formOverlay.classList.add('hidden');
-  document.querySelector('body').classList.remove('.modal-open');
+  document.querySelector('body').classList.remove('modal-open');
   document.removeEventListener('keydown', onEscKeyDown);
   buttonCloseUpload.removeEventListener('click', onUploadCancelClick);
 
@@ -39,7 +46,7 @@ function closeUploadModal () {
 
 const openUploadModal = () => {
   formOverlay.classList.remove('hidden');
-  document.querySelector('body').classList.add('.modal-open');
+  document.querySelector('body').classList.add('modal-open');
   document.addEventListener('keydown', onEscKeyDown);
   buttonCloseUpload.addEventListener('click', onUploadCancelClick);
 

js/form/image-scale.js

@@ -1,10 +1,11 @@
+const SCALE_STEP = 0.25;
+
 const scaleValue = document.querySelector('.scale__control--value');
 const imagePrewiev = document.querySelector('.img-upload__preview img');
 const buttonSmaller = document.querySelector('.scale__control--smaller');
 const buttonBigger = document.querySelector('.scale__control--bigger');
 
 let scale = 1;
-const SCALE_STEP = 0.25;
 
 const onButtonSmallerClick = () => {
   if(scale > SCALE_STEP) {

js/form/validation.js

@@ -1,10 +1,10 @@
+const MAX_QUATITY = 5;
+const MAX_QUANTITY_SIMBOL = 140;
+
 const uploadForm = document.querySelector('.img-upload__form');
 const hashtagsInput = uploadForm.querySelector('.text__hashtags');
 const descriptionInput = uploadForm.querySelector('.text__description');
 
-const MAX_QUATITY = 5;
-const MAX_QUANTITY_SIMBOL = 140;
-
 let errorMessage = '';
 
 const pristine = new Pristine(uploadForm, {
@@ -17,20 +17,20 @@ const validateForm = () => pristine.validate();
 
 const checkRules = [
   {
-    check: (inputArray) => inputArray.some((element) => !/^#[a-zа-яё1-9]{1,19}$/i.test(element)),
+    check: (inputsArray) => inputsArray.some((element) => !/^#[a-zа-яё1-9]{1,19}$/i.test(element)),
     error: 'Не допустимые символы!'
   },
   {
-    check: (inputArray) => inputArray.length > MAX_QUATITY,
+    check: (inputsArray) => inputsArray.length > MAX_QUATITY,
     error: `Не более ${MAX_QUATITY} хэштегов!`
   },
   {
-    check: (inputArray) => inputArray.some((element, num, Array) => Array.includes(element, num + 1)),
+    check: (inputsArray) => inputsArray.some((element, num, elementsArray) => elementsArray.includes(element, num + 1)),
     error: 'Хэштэги не должны повторяться!'
   },
 ];
 
-const validHashtags = (value) => {
+const validateHashtags = (value) => {
   const inputText = value.toLowerCase().trim();
   const inputArray = inputText.split(' ');
 
@@ -51,11 +51,11 @@ const validHashtags = (value) => {
   return checks;
 };
 
-const validDescription = (value) => {
-  const inputCommentArray = value;
-  inputCommentArray.split(' ');
+const validateDescription = (value) => {
+  const inputCommentsArray = value;
+  inputCommentsArray.split(' ');
 
-  const isInvalid = inputCommentArray.length > MAX_QUANTITY_SIMBOL;
+  const isInvalid = inputCommentsArray.length > MAX_QUANTITY_SIMBOL;
 
   if (isInvalid){
     errorMessage = `Не более ${MAX_QUANTITY_SIMBOL} символов!`;
@@ -65,8 +65,8 @@ const validDescription = (value) => {
 };
 
 const initValidation = () => {
-  pristine.addValidator(hashtagsInput, validHashtags, () => errorMessage);
-  pristine.addValidator(descriptionInput, validDescription, () => errorMessage);
+  pristine.addValidator(hashtagsInput, validateHashtags, () => errorMessage);
+  pristine.addValidator(descriptionInput, validateDescription, () => errorMessage);
 };
 
 export { initValidation, validateForm };

js/messages.js

@@ -28,10 +28,12 @@ const generateErrorMessage = (message) => {
 const closeMessage = () => {
   if (successMessageContainer) {
     successMessageContainer.remove();
+    return;
   }
 
   if(errorMessageContainer) {
     errorMessageContainer.remove();
+    return;
   }
 
   document.body.removeEventListener('click', onBodyCancelClick);
@@ -82,4 +84,4 @@ const showErrorMessage = () => {
   showPopupMessage(errorNode);
 };
 
-export { generateErrorMessage, showSuccessMessage, showErrorMessage, hasErrorMessage };
+export { generateErrorMessage, showSuccessMessage, showErrorMessage, hasErrorMessage, closeMessage };

js/render-thumbnails.js

@@ -1,11 +1,11 @@
 const usersPhotoList = document.querySelector('.pictures');
 const thumbnails = document.querySelector('#picture').content.querySelector('.picture');
 
-const renderThumbnails = (userPhoto) => {
+const renderThumbnails = (userPhotos) => {
   usersPhotoList.querySelectorAll('.picture').forEach((photo) => photo.remove());
   const photoFragment = document.createDocumentFragment();
 
-  userPhoto.forEach((photo) => {
+  userPhotos.forEach((photo) => {
     const photoElement = thumbnails.cloneNode(true);
 
     photoElement.dataset.pictureId = photo.id;

js/util.js

@@ -6,26 +6,7 @@ const getRandomInteger = (min, max) => {
   return Math.floor(result);
 };
 
-const createPreviousRangeGenerator = (min, max) => {
-  const previousValues = [];
-
-  return function () {
-    let currentValue = getRandomInteger(min, max);
-    if (previousValues.length >= (max - min + 1)) {
-      return null;
-    }
-    while (previousValues.includes(currentValue)) {
-      currentValue = getRandomInteger(min, max);
-    }
-    previousValues.push(currentValue);
-    return currentValue;
-  };
-};
-
-const getRandomArrayElement = (elements) => elements[getRandomInteger(0, elements.length - 1)];
-
 const isEscapeKey = (evt) => evt.key === 'Escape';
-const isEnterKey = (evt) => evt.key === 'Enter';
 
 function debounce (callback, timeoutDelay) {
   let timeoutId;
@@ -36,4 +17,4 @@ function debounce (callback, timeoutDelay) {
   };
 }
 
-export { getRandomInteger, createPreviousRangeGenerator, getRandomArrayElement, isEscapeKey, isEnterKey, debounce };
+export { getRandomInteger, isEscapeKey, debounce };