Фото на память

js/effects-photo.js

@@ -1,9 +1,7 @@
-import { imgUploadForm } from './open-form.js';
-
+const imgUploadForm = document.querySelector('.img-upload__form');
+const scaleValue = imgUploadForm.querySelector('.scale__control--value');
 const scale = imgUploadForm.querySelector('.scale');
-
-const scaleValue = scale.querySelector('.scale__control--value');
-const imgUploadPreview = imgUploadForm.querySelector('.img-upload__preview');
+const imgUploadPreview = imgUploadForm.querySelector('.img-upload__preview img');
 const effectsRadioButtons = imgUploadForm.querySelectorAll('.effects__radio');
 const effectLevelValue = imgUploadForm.querySelector('.effect-level__value');
 const sliderElement = imgUploadForm.querySelector('.effect-level__slider');
@@ -122,9 +120,15 @@ effectsRadioButtons.forEach((button) =>{
 });
 
 sliderElement.noUiSlider.on('update', () => {
-  effectLevelValue.value = sliderElement.noUiSlider.get();
+  effectLevelValue.value = parseFloat(sliderElement.noUiSlider.get());
   if(effectLevelValue.dataset.effect) {
     const effect = FILTER_EFFECTS[effectLevelValue.dataset.effect];
     changePhotoStyle(effect);
   }
 });
+
+const removeScaleChanges = () => {
+  scaleValue.setAttribute('value', `${ScaleMaxMin.SCALE_MAX}`);
+  imgUploadPreview.style.transform = 'scale(1)';
+};
+export {removeScaleChanges, imgUploadForm, scaleValue};

js/filters.js

@@ -24,17 +24,23 @@ const showFilters = () => filters.classList.remove('img-filters--inactive');
 let dataFilterId;
 let photos = [];
 
+const debounceRender = debounce(renderThumbnails);
+
 const getPhotosToRender = (filter) => {
   let photosToRender = [];
   const copyPhotos = photos.slice();
-  if (filter === FILTERS.random) {
-    photosToRender = copyPhotos.sort(SORT_FUNCTIONS.random).slice(0, PHOTO_NUMBERS_RANDOM);
-  } else if (filter === FILTERS.discussed) {
-    photosToRender = copyPhotos.sort(SORT_FUNCTIONS.discussed).slice(0, PHOTO_NUMBERS_DEFAULT);
-  } else{
-    photosToRender = copyPhotos.slice(0, PHOTO_NUMBERS_DEFAULT);
+  switch (filter) {
+    case FILTERS.random:
+      photosToRender = copyPhotos.sort(SORT_FUNCTIONS.random).slice(0, PHOTO_NUMBERS_RANDOM);
+      break;
+    case FILTERS.discussed:
+      photosToRender = copyPhotos.sort(SORT_FUNCTIONS.discussed).slice(0, PHOTO_NUMBERS_DEFAULT);
+      break;
+    case FILTERS.default:
+      photosToRender = copyPhotos.slice(0, PHOTO_NUMBERS_DEFAULT);
+      break;
   }
-  debounce(renderThumbnails(photosToRender));
+  debounceRender(photosToRender);
 };
 
 const setFilterClick = (evt) => {

js/main.js

@@ -1,5 +1,4 @@
 import { renderThumbnails } from './render-photos.js';
-// import { getPhotosToRender } from './filters.js';
 import { getBigPicture } from './open-full-photo.js';
 import { renderFullPhoto } from './render-full-photo.js';
 import {setUserFormSubmit} from './validate-form.js';
@@ -11,7 +10,6 @@ import { showFilters, setFilters } from './filters.js';
 import './upload-photo.js';
 
 const PHOTO_ITEMS_NUMBER = 25;
-// const RERENDER_DELAY = 500;
 
 getData()
   .then((photos) => {

js/open-form.js

@@ -1,17 +1,15 @@
 import { body } from './open-full-photo.js';
 import { isEscapeKey } from './utils.js';
-// import './validate-form.js';
-import { pristine } from './validate-form.js';
+import { pristine, infoRequestElement, imgHashtags } from './validate-form.js';
+import { removeScaleChanges, imgUploadForm, scaleValue } from './effects-photo.js';
 
-const imgUploadForm = document.querySelector('.img-upload__form');
 const imgUploadOverlay = imgUploadForm.querySelector('.img-upload__overlay');
 const imgUploadClose = imgUploadForm.querySelector('.img-upload__cancel');
-const imgHashtags = imgUploadForm.querySelector('.text__hashtags');
-const imgDescription = imgUploadForm.querySelector('.text__description');
 
+const imgDescription = imgUploadForm.querySelector('.text__description');
 
 const onDocumentKeydown = (evt) => {
-  if (isEscapeKey(evt) && document.activeElement !== imgHashtags && document.activeElement !== imgDescription) {
+  if (isEscapeKey(evt) && document.activeElement !== imgHashtags && document.activeElement !== imgDescription && infoRequestElement !== 'error') {
     evt.preventDefault();
     closeUploadForm();
   }
@@ -35,6 +33,7 @@ function closeUploadForm() {
   imgUploadClose.removeEventListener('click', closeUploadForm);
   pristine.reset();
   clearForm();
+  removeScaleChanges();
 }
 
-export { imgUploadForm, imgHashtags, closeUploadForm, openUploadForm };
+export { imgUploadForm, imgHashtags, closeUploadForm, openUploadForm, scaleValue };

js/render-full-photo.js

@@ -35,7 +35,7 @@ const renderComments = (nextComments) => {
 };
 
 const disableShowcomments = (commentsLength) => {
-  buttonMoreComments.disabled = true;
+  buttonMoreComments.classList.add('hidden');
   shownComments.textContent = commentsLength;
 };
 
@@ -73,7 +73,7 @@ buttonMoreComments.addEventListener('click', () => {
 
 const clearComments = () => {
   commentsList.innerHTML = '';
-  buttonMoreComments.disabled = false;
+  buttonMoreComments.classList.remove('hidden');
   commentsData = [];
   indexCounter = 0;
 };

js/validate-form.js

@@ -1,9 +1,10 @@
-import { imgUploadForm, imgHashtags } from './open-form.js';
+import { imgUploadForm } from './effects-photo.js';
 import { sendData, ErrorIdTemplates } from './api.js';
 import { showRequestInfo } from './utils.js';
 import { body } from './open-full-photo.js';
 import { isEscapeKey } from './utils.js';
 
+const imgHashtags = imgUploadForm.querySelector('.text__hashtags');
 const imgComments = imgUploadForm.querySelector('.text__description');
 const submitButton = imgUploadForm.querySelector('.img-upload__submit');
 
@@ -76,7 +77,7 @@ function validateHashtags(value) {
   if (!value) {
     return true;
   }
-  hashArray = value.trim().toLowerCase().split(' ');
+  hashArray = value.trim().toLowerCase().split(' ').filter(Boolean);
   checkHashErrors().map((errorHash) => {
     if (errorHash.check) {
       hashErrorMassege.push(errorHash.error);
@@ -107,8 +108,7 @@ const unblockSubmitButton = () => {
 };
 
 const closeInfo = (evt) => {
-  if (
-    isEscapeKey(evt) ||
+  if ((isEscapeKey(evt) && infoRequestElement !== 'error') ||
     evt.target.classList.contains(RequestResultTags[infoRequestElement].BUTTON) ||
     !evt.target.classList.contains(RequestResultTags[infoRequestElement].INNER)
   ) {
@@ -132,11 +132,11 @@ const setUserFormSubmit = (cb) => {
       blockSubmitButton();
       sendData(new FormData(evt.target))
         .then(() => appendInfo(infoRequestElement = ErrorIdTemplates.SUCCESS))
-        .then(() => cb())
+        .then(() => cb(infoRequestElement))
         .catch(() => appendInfo(infoRequestElement = ErrorIdTemplates.SEND_ERROR))
         .finally(unblockSubmitButton);
     }
   });
 };
 
-export { pristine, setUserFormSubmit };
+export { pristine, setUserFormSubmit, infoRequestElement, imgHashtags };