Merge pull request #14 from bearBenjamin/module12-task2

refactor: внес изменения для прохождения тестов

Author: VAnastasia

index.html

@@ -121,16 +121,11 @@ <h2 class="img-upload__title  visually-hidden">Загрузка фотограф
                     minlength="2" maxlength="104"
                     data-pristine-minlength-message="Минимальная длина 2 символа"
                     data-pristine-maxlength-message="Максимальная длина 104 символа">
-
                   </div>
                   <div class="img-upload__field-wrapper">
-                    <textarea class="text__description" name="description" placeholder="Ваш комментарий..."
-                    minlength="2" maxlength="140"
-                    data-pristine-minlength-message="Минимальная длина 2 символа"
-                    data-pristine-maxlength-message="Максимальная длина 140 символов"></textarea>
+                    <textarea class="text__description" name="description" placeholder="Ваш комментарий..."></textarea>
                   </div>
                 </fieldset>
-
                 <!-- Кнопка для отправки данных на сервер -->
                 <button type="submit" class="img-upload__submit" id="upload-submit">Опубликовать</button>
               </div>

js/filter.js

@@ -2,6 +2,8 @@ import { renderPreview } from './preview-photo.js';
 import { getCurrentData } from './full-photo.js';
 import { debounce } from './utils.js';
 
+const TIME_DELAY = 500;
+
 const pictureContainer = document.querySelector('.pictures.container');
 
 const filterContainer = document.querySelector('.img-filters');
@@ -27,20 +29,7 @@ const showPhotos = (dataPhotos) => {
   getCurrentData(dataPhotos);
 };
 
-const showPhotosDebounce = debounce((data) => showPhotos(data));
-
-// const shuffleData = (dataPhotos, count = 10) => {
-//   const array = [...dataPhotos];
-//   let randomIndex;
-
-//   for (let i = array.length - 1; i > 0; i -= 1) {
-//     randomIndex = Math.floor(Math.random() * (i + 1));
-
-//     [array[i], array[randomIndex]] = [array[randomIndex], array[i]];
-//   }
-
-//   return array.slice(0, Math.min(count, array.length));
-// };
+const showPhotosDebounce = debounce((data, time) => showPhotos(data, time));
 
 const getRandomPhoto = (dataPhoto) => {
   const result = [];
@@ -82,18 +71,18 @@ const getFilterPhotos = (dataPhotos) => {
 
       switch(btn.id) {
         case ('filter-default'):
-          showPhotosDebounce(dataPhotos);
+          showPhotosDebounce(dataPhotos, TIME_DELAY);
           break;
 
         case ('filter-random'): {
           const newDataPhotos = getRandomPhoto(dataPhotos);
-          showPhotosDebounce(newDataPhotos);
+          showPhotosDebounce(newDataPhotos, TIME_DELAY);
           break;
         }
 
         case ('filter-discussed'): {
           const newDataPhotos = sortMessageAmount(dataPhotos);
-          showPhotosDebounce(newDataPhotos);
+          showPhotosDebounce(newDataPhotos, TIME_DELAY);
           break;
         }
       }

js/form.js

@@ -31,7 +31,7 @@ pristine.addValidator(fieldHashtag, isHashtag, 'Неверный хэш-тег',
 pristine.addValidator(fieldHashtag, isDubleHashtags, 'Хэш-теги дублируются', 2, false);
 pristine.addValidator(fieldHashtag, isLengthHashtags, 'Не более пяти хэш-тегов', 3, false);
 
-pristine.addValidator(fieldDescription, isCommentLength, false);
+pristine.addValidator(fieldDescription, isCommentLength, 'Не более 140 символов', false);
 
 const showModalEditing = () => {
   modalEditing.classList.remove('hidden');
@@ -56,7 +56,6 @@ const onFieldLoadChange = (evt) => {
     });
   }
 
-
   showModalEditing();
 };
 
@@ -69,7 +68,7 @@ const onBtnCloseClick = () => {
   document.removeEventListener('keydown', onModalEditingEscKeydown);
 };
 
-fieldLoadFile.addEventListener('change', onFieldLoadChange);
+//fieldLoadFile.addEventListener('change', onFieldLoadChange);
 
 const blockBtnSubmit = () => {
   btnSubmitForm.disabled = true;
@@ -92,17 +91,19 @@ const initFormSubmit = () => {
         .then(() => {
           showSucces();
           onBtnCloseClick();
+          unBlockBtnSubmit();
         })
         .catch(() => {
           showError();
+          unBlockBtnSubmit();
         });
-      unBlockBtnSubmit();
+
     }
   });
-
-  btnCloseForm.addEventListener('click', onBtnCloseClick);
 };
 
+btnCloseForm.addEventListener('click', onBtnCloseClick);
+
 function onModalEditingEscKeydown (evt) {
   if (fieldHashtag === document.activeElement || fieldDescription === document.activeElement) {
     return evt;
@@ -114,4 +115,4 @@ function onModalEditingEscKeydown (evt) {
   }
 }
 
-export { initFormSubmit, onModalEditingEscKeydown };
+export { initFormSubmit, onModalEditingEscKeydown, onFieldLoadChange };

js/main.js

@@ -1,17 +1,21 @@
-import { initFormSubmit } from './form.js';
+import { initFormSubmit, onFieldLoadChange } from './form.js';
 import { getData } from './fetch.js';
 import { showAlert } from './modal-message-user.js';
 import { getFilterPhotos } from './filter.js';
 
-const init = () => {
-  getData()
-    .then((dataPhotos) => {
-      getFilterPhotos(dataPhotos);
-    })
-    .catch(() => {
-      showAlert();
-    });
-  initFormSubmit();
-};
 
-init();
+const fieldLoadFileElement = document.querySelector('#upload-file');
+
+fieldLoadFileElement.addEventListener('change', onFieldLoadChange);
+
+getData()
+  .then((dataPhotos) => {
+    getFilterPhotos(dataPhotos);
+  })
+  .catch(() => {
+    showAlert();
+  });
+
+initFormSubmit();
+
+

js/modal-message-user.js

@@ -88,7 +88,7 @@ const showError = () => {
   const templateShowError = document.querySelector('#error').content;
   const newTemplateShowError = templateShowError.querySelector('.error');
   const cloneShowError = newTemplateShowError.cloneNode(true);
-  cloneShowError.setAttribute('style', 'z-index: 3');
+  //cloneShowError.setAttribute('style', 'z-index: 3');
 
   document.body.append(cloneShowError);