✔️ Сборка #10

Author: Keks

10/js/form-validation.js

@@ -14,38 +14,46 @@ const pristine = new Pristine(formElement, {
 
 const hashtag = /^#[a-zа-яё0-9]{1,19}$/i;
 
-const isHashtagValid = (value) => hashtag.test(value);
+const convertHashtags = (value) => value.trim().toLowerCase().split(/\s+/);
 
-const isEveryHashtagValid = (hashtags) => hashtags.every((item) => isHashtagValid(item));
+const checkHashtagValid = (value) => hashtag.test(value);
 
-const isHashtagsCountValid = (hashtags) => hashtags.length <= MAX_HASHTAGS_COUNT;
+const checkEveryHashtagValid = (hashtags) => hashtags.every((item) => checkHashtagValid(item));
 
-const isHashtagsUnique = (hashtags) => new Set(hashtags).size === hashtags.length;
+const checkHashtagsCountValid = (hashtags) => hashtags.length <= MAX_HASHTAGS_COUNT;
+
+const checkHashtagsUnique = (hashtags) => new Set(hashtags).size === hashtags.length;
+
+let isEveryHashtagValid = true;
+let isHashtagsCountValid = true;
+let isHashtagsUnique = true;
 
 const validateHashtagsField = (value) => {
-  if (!value) {
+  if (!value.trim()) {
     return true;
   }
 
-  const hashtags = value.trim().split(/\s+/);
+  const hashtags = convertHashtags(value);
 
-  return isEveryHashtagValid(hashtags) && isHashtagsCountValid(hashtags) && isHashtagsUnique(hashtags);
+  isEveryHashtagValid = checkEveryHashtagValid(hashtags);
+  isHashtagsCountValid = checkHashtagsCountValid(hashtags);
+  isHashtagsUnique = checkHashtagsUnique(hashtags);
+
+  return isEveryHashtagValid && isHashtagsCountValid && isHashtagsUnique;
 };
 
 const validateDescriptionField = (value) => value.length <= MAX_DESCRIPTION_LENGTH;
 
-const getHashtagsErrorMessage = (value) => {
-  const hashtags = value.trim().split(/\s+/);
-
-  if (!isEveryHashtagValid(hashtags)) {
+const getHashtagsErrorMessage = () => {
+  if (!isEveryHashtagValid) {
     return 'Невалидный хэштег';
   }
 
-  if (!isHashtagsUnique(hashtags)) {
+  if (!isHashtagsUnique) {
     return 'Хэштеги повторяются';
   }
 
-  if (!isHashtagsCountValid(hashtags)) {
+  if (!isHashtagsCountValid) {
     return 'Не более 5 хэштегов';
   }
 };

10/js/form.js

@@ -13,7 +13,7 @@ const sliderWrapperElement = modalFormElement.querySelector('.img-upload__effect
 
 const onDocumentKeydown = (evt) => {
   if (isEscKey(evt)) {
-    if (evt.target.matches('.text__description')) {
+    if (evt.target.matches('.text__description') || evt.target.matches('.text__hashtags')) {
       evt.stopPropagation();
     } else {
       evt.preventDefault();

10/js/photo-filters.js

@@ -1,4 +1,4 @@
-const EffectsNames = {
+const EffectsMap = {
   'chrome': 'grayscale',
   'sepia': 'sepia',
   'marvin': 'invert',
@@ -81,24 +81,19 @@ const onSliderUpdate = () => {
   const sliderValue = sliderElement.noUiSlider.get();
   effectFieldElement.value = `${sliderValue}`;
 
-  if (currentFilter) {
-    const style = `${EffectsNames[currentFilter]}(${sliderValue}${currentFilter === 'marvin' ? '%' : ''}${currentFilter === 'phobos' ? 'px' : ''})`;
+  const propertyValue = `${EffectsMap[currentFilter]}(${sliderValue}${currentFilter === 'marvin' ? '%' : ''}${currentFilter === 'phobos' ? 'px' : ''})`;
 
-    imageElement.style.filter = `${style}`;
-  }
+  imageElement.style.filter = `${propertyValue}`;
 };
 
 const onEffectsListChange = (evt) => {
   if (evt.target.matches('.effects__radio')) {
-
     const targetElementValue = evt.target.value;
 
     if (targetElementValue === 'none') {
       sliderWrapperElement.classList.add('hidden');
       currentFilter = '';
-      imageElement.style = '';
-      sliderElement.noUiSlider.set(100);
-
+      imageElement.style.filter = 'none';
     } else {
       sliderWrapperElement.classList.remove('hidden');
       currentFilter = targetElementValue;