Обработчики и сброс формы

htmlacademy-javascript · Jan 20, 2025 · 3edc1c2 · 3edc1c2
1 parent dc48ebd
commit 3edc1c2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/js/form-validation.js b/js/form-validation.js
@@ -63,10 +63,10 @@ const setUserFormSubmit = (onSuccess) => {
       const sendDataPromise = sendData(formData);
       sendDataPromise
         .then(() => {
-          showSuccess();
           imgUploadFormElement.reset();
+          showSuccess();
+          onSuccess();
         })
-        .then(onSuccess)
         .catch(() => {
           showError(errorElement);
         })
@@ -75,9 +75,11 @@ const setUserFormSubmit = (onSuccess) => {
   });
 };
 
+const resetValidator = () => pristine.reset();
+
 pristine.addValidator(hashtagsInputElement, validatesHashtagCount, 'Превышено количество хэштегов');
 pristine.addValidator(hashtagsInputElement, validatesHashtagWithRegex, 'Введён невалидный хэштег');
 pristine.addValidator(hashtagsInputElement, validatesHashtagRepeats, 'Хэштеги повторяются');
 pristine.addValidator(descriptionInutElement, validatesCommentLength, `Длина комментария больше ${MAX_COMMENT_LENGTH} символов`);
 
-export {setUserFormSubmit};
+export {setUserFormSubmit, resetValidator};
diff --git a/js/upload-photo-form.js b/js/upload-photo-form.js
@@ -1,5 +1,6 @@
 import {isEscapeKey} from './util.js';
 import {onSliderEffectsChange, resetPhotoEditor} from './photo-editor.js';
+import { resetValidator } from './form-validation.js';
 
 const bodyElement = document.body;
 const imgUploadFormElement = bodyElement.querySelector('.img-upload__form');
@@ -10,7 +11,7 @@ const imgUploadOverlay = imgUploadFormElement.querySelector('.img-upload__overla
 const buttonUploadCancelElement = imgUploadFormElement.querySelector('.img-upload__cancel');
 const effectsElement = imgUploadFormElement.querySelector('.img-upload__effects');
 
-//Функция-обработчик закрытия формы по ESC
+//!!Функция-обработчик закрытия формы по ESC
 const onDocumentKeydown = (evt) => {
   if (isEscapeKey(evt)) {
     evt.preventDefault();
@@ -30,22 +31,24 @@ const onDocumentKeydown = (evt) => {
   }
 };
 
-//Функция закрытия формы по нажатию на кнопку
+//!!Функция закрытия формы по нажатию на кнопку
 const onCloseButtonClick = () => closeUploadForm();
 
 //Закрытие формы загрузки
 function closeUploadForm() {
-  imgUploadOverlay.classList.add('hidden');
-  bodyElement.classList.remove('modal-open');
-  buttonUploadCancelElement.removeEventListener('click', onCloseButtonClick);
+  imgUploadOverlay.classList.add('hidden');//
+  bodyElement.classList.remove('modal-open');//
+  document.removeEventListener('keydown', onDocumentKeydown);//
+  buttonUploadCancelElement.removeEventListener('click', onCloseButtonClick);//
   resetPhotoEditor();
+  resetValidator();
 }
 
 //Открытие формы загрузки
 const openUploadForm = () => {
   imgUploadFormInputElement.addEventListener('change', () => {
-    imgUploadOverlay.classList.remove('hidden');
-    bodyElement.classList.add('modal-open');
+    imgUploadOverlay.classList.remove('hidden');//
+    bodyElement.classList.add('modal-open');//
     document.addEventListener('keydown', onDocumentKeydown);
     buttonUploadCancelElement.addEventListener('click', onCloseButtonClick);
     effectsElement.addEventListener('change', onSliderEffectsChange);