Merge pull request #17 from PAVLUXAN/master

Author: keksobot

js/main.js

@@ -4,12 +4,12 @@ import { getData } from './api.js';
 import { showErrorGetting } from './messages.js';
 import { initFilter, setPhotos } from './filter.js';
 
-initFilter(renderPhotos);
 getData().then((response) => {
   if (response.hasError) {
     showErrorGetting();
     return;
   }
+  initFilter(renderPhotos);
   const { data = [] } = response;
   setPhotos(data);
 });

js/messages.js

@@ -71,18 +71,6 @@ export const showErrorSending = () => {
 
 export const showErrorGetting = () => {
   const errorNotify = getErrorTemplate.cloneNode(true);
-  const errorTitle = errorNotify.querySelector('.data-error__title');
-
-  errorTitle.style.zIndex = '100';
-  errorTitle.style.position = 'absolute';
-  errorTitle.style.left = '0';
-  errorTitle.style.top = '0';
-  errorTitle.style.right = '0';
-  errorTitle.style.padding = '10px 3px';
-  errorTitle.style.fontSize = '20px';
-  errorTitle.style.textAlign = 'center';
-  errorTitle.style.backgroundColor = 'red';
-
   document.body.append(errorNotify);
 
   setTimeout(() => {

js/render-big-photo.js

@@ -5,7 +5,7 @@ const bigPhotoForm = document.querySelector('.big-picture');
 const bigPhotoImgOverlay = bigPhotoForm
   .querySelector('.big-picture__img')
   .querySelector('img');
-const bigPhotolikesCount = bigPhotoForm.querySelector('.likes-count');
+const bigPhotoLikesCount = bigPhotoForm.querySelector('.likes-count');
 const bigPhotoCaption = bigPhotoForm.querySelector('.social__caption');
 const bigPhotoCancelButton = bigPhotoForm.querySelector('.big-picture__cancel');
 
@@ -32,7 +32,7 @@ const closeBigPicture = () => {
 export const openBigPhoto = (photo) => {
   const currentPhoto = photo;
   bigPhotoImgOverlay.src = currentPhoto.url;
-  bigPhotolikesCount.textContent = currentPhoto.likes;
+  bigPhotoLikesCount.textContent = currentPhoto.likes;
   bigPhotoCaption.textContent = currentPhoto.description;
 
   renderComments(currentPhoto.comments);

js/slider-effects.js

@@ -24,7 +24,7 @@ noUiSlider.create(slider, {
 });
 
 slider.noUiSlider.on('update', () => {
-  effectLevelValue.value = slider.noUiSlider.get();
+  effectLevelValue.value = Number(slider.noUiSlider.get());
 });
 
 effectLevelOverlay.classList.add('hidden');

js/validator.js

@@ -3,18 +3,26 @@ import { selectPluralForm } from './util.js';
 const MAX_HASHTAGS = 5;
 const MAX_SYMBOLS_HASHTAG = 20;
 const MAX_SYMBOLS_COMMENT = 140;
+const TEXT_LENGTH_MOST_BE_LESS_OR_EQUAL = 'Длина текста должна быть меньше или равна 140 символов';
 
-let errorMessage = '';
+//let errorMessage = '';
+
+const errors = {
+  hashtags: '',
+  description: ''
+};
+
+export const getError = () => Object.values(errors).filter(Boolean).join(' и ');
 
-export const getError = () => errorMessage;
 
 export const isHashtagsValid = (value) => {
-  errorMessage = '';
+  errors.hashtags = '';
+  const isDescriptonError = !errors.description.length;
 
   const inputText = value.toLowerCase().trim();
 
   if (!value.trim()) {
-    return true;
+    return isDescriptonError;
   }
 
   const hashTags = inputText.split(/\s+/);
@@ -61,26 +69,22 @@ export const isHashtagsValid = (value) => {
   return rules.every((rule) => {
     const isInvalid = rule.isInvalid();
     if (isInvalid) {
-      errorMessage = rule.error;
+      errors.hashtags = rule.error;
     }
     return !isInvalid;
-  });
+  }) && isDescriptonError;
 };
 
 export const isDescriptionValid = (value) => {
-  errorMessage = '';
-
+  errors.description = '';
+  const isHashtagsError = !errors.hashtags.length;
   if (!value) {
-    return true;
+    return isHashtagsError;
   }
 
-  const rule = {
-    check: value.length >= MAX_SYMBOLS_COMMENT,
-    error: 'Длина текста должна быть меньше или равна 140 символов',
-  };
-  const isInvalid = rule.check;
+  const isInvalid = value.length >= MAX_SYMBOLS_COMMENT;
   if (isInvalid) {
-    errorMessage = rule.error;
+    errors.description = TEXT_LENGTH_MOST_BE_LESS_OR_EQUAL;
   }
-  return !isInvalid;
+  return !isInvalid && isHashtagsError;
 };