✔️ Сборка #13

Author: Keks

13/js/form.js

@@ -38,18 +38,22 @@ const toggleSubmitButton = (isDisabled, text) => {
   submitButtonElement.textContent = text;
 };
 
-function openModalForm() {
+const resetForm = () => {
+  formElement.reset();
+};
+
+const openModalForm = () => {
   modalFormElement.classList.remove('hidden');
   bodyElement.classList.add('modal-open');
   document.addEventListener('keydown', onDocumentKeydown);
   sliderWrapperElement.classList.add('hidden');
-}
+};
 
 function closeModalForm() {
   modalFormElement.classList.add('hidden');
   bodyElement.classList.remove('modal-open');
   document.removeEventListener('keydown', onDocumentKeydown);
-  formElement.reset();
+  resetForm();
   resetPhotoFilters();
   resetScaleValue();
   resetValidation();
@@ -91,6 +95,7 @@ const initModalForm = () => {
         preview.style.backgroundImage = `url(${imageURL})`;
       });
     } else {
+      resetForm();
       showAlertTemporarily('Неверный формат изображения');
     }
   });

13/js/photo-filters.js

@@ -5,14 +5,6 @@ const DefaultSettings = {
   STEP: 1
 };
 
-const EffectsMap = {
-  'chrome': 'grayscale',
-  'sepia': 'sepia',
-  'marvin': 'invert',
-  'phobos': 'blur',
-  'heat': 'brightness',
-};
-
 const EffectsSettings = {
   'chrome': {
     range: {
@@ -56,6 +48,14 @@ const EffectsSettings = {
   }
 };
 
+const effectsMap = {
+  'chrome': 'grayscale',
+  'sepia': 'sepia',
+  'marvin': 'invert',
+  'phobos': 'blur',
+  'heat': 'brightness',
+};
+
 const sliderWrapperElement = document.querySelector('.img-upload__effect-level');
 const sliderElement = sliderWrapperElement.querySelector('.effect-level__slider');
 const effectFieldElement = sliderWrapperElement.querySelector('.effect-level__value');
@@ -84,7 +84,7 @@ const onSliderUpdate = () => {
   const sliderValue = sliderElement.noUiSlider.get();
   effectFieldElement.value = `${sliderValue}`;
 
-  const propertyValue = `${EffectsMap[currentFilter]}(${sliderValue}${currentFilter === 'marvin' ? '%' : ''}${currentFilter === 'phobos' ? 'px' : ''})`;
+  const propertyValue = `${effectsMap[currentFilter]}(${sliderValue}${currentFilter === 'marvin' ? '%' : ''}${currentFilter === 'phobos' ? 'px' : ''})`;
 
   imageElement.style.filter = `${propertyValue}`;
 };

13/js/photo-modal.js

@@ -45,7 +45,7 @@ const renderBigPhoto = ({url, likes, description}) => {
   modalDescriptionElement.textContent = description;
 };
 
-function openPhotoModal(photo) {
+const openPhotoModal = (photo) => {
   modalElement.classList.remove('hidden');
   comments = photo.comments;
 
@@ -56,7 +56,7 @@ function openPhotoModal(photo) {
 
   document.addEventListener('keydown', onDocumentKeydown);
   bodyElement.classList.add('modal-open');
-}
+};
 
 function closePhotoModal() {
   startIndex = 0;

13/js/send-info-modal.js

@@ -37,7 +37,7 @@ const createSendInfoModal = (template, message) => {
   return templateModalElement;
 };
 
-function renderSendInfoModal(status, message) {
+const renderSendInfoModal = (status, message) => {
   if (!VALID_STATUSES.includes(status)) {
     return;
   }
@@ -47,7 +47,7 @@ function renderSendInfoModal(status, message) {
   bodyElement.append(modalElement);
   document.addEventListener('keydown', onBodyKeydown);
   modalElement.addEventListener('click', onModalClick);
-}
+};
 
 function removeSendInfoModal() {
   modalElement.remove();

13/js/utils.js

@@ -57,14 +57,14 @@ const getPluralForm = (number, formForOne, formForFew, formForMany) => {
   return formForMany;
 };
 
-function debounce (callback, timeoutDelay = DEFAULT_TIMEOUT_DELAY) {
+const debounce = (callback, timeoutDelay = DEFAULT_TIMEOUT_DELAY) => {
   let timeoutId;
 
   return (...rest) => {
     clearTimeout(timeoutId);
     timeoutId = setTimeout(() => callback.apply(this, rest), timeoutDelay);
   };
-}
+};
 
 export {
   findTemplateById,