Merge pull request #15 from NoaVel/master

Fix critical issues and cleanup project

Author: stakeout

js/check-hashtag-validity.js

@@ -14,12 +14,13 @@ const hasValidHashtagCount = (value) =>
 const hasValidHashtagLength = (value) =>
   normalizeHashtags(value).every((hashtag) => hashtag.length <= MAX_HASHTAG_LENGTH);
 
-const hasValidHashtagFormat = (value) =>
-  normalizeHashtags(value).every((hashtag) =>
-    hashtag.startsWith('#') &&
-    hashtag.length > 1 &&
-    HASHTAG_REGEXP.test(hashtag)
-  );
+const hasValidHashtagFormat = (value) => {
+  const hashtags = normalizeHashtags(value);
+  if (hashtags.length === 0) {
+    return true;
+  }
+  return hashtags.every((hashtag) => HASHTAG_REGEXP.test(hashtag));
+};
 
 const hasUniqueHashtags = (value) => {
   const hashtags = normalizeHashtags(value);

js/create-array-photos.js

@@ -11,37 +11,41 @@ const FilterId = {
   DISCUSSED: 'filter-discussed',
 };
 
-const filtersSection = document.querySelector('.img-filters');
-const filtersForm = document.querySelector('.img-filters__form');
+const filtersSectionNode = document.querySelector('.img-filters');
+const filtersFormNode = document.querySelector('.img-filters__form');
 
 let currentFilter = FilterId.DEFAULT;
-let photos = [];
+let loadedPhotos = [];
 
-const getRandomPhotos = (photosArray) => {
-  const shuffled = [...photosArray].sort(() => Math.random() - 0.5);
+const getRandomPhotos = (photos) => {
+  const shuffled = [...photos];
+  for (let i = shuffled.length - 1; i > 0; i--) {
+    const j = Math.floor(Math.random() * (i + 1));
+    [shuffled[i], shuffled[j]] = [shuffled[j], shuffled[i]];
+  }
   return shuffled.slice(0, RANDOM_PHOTOS_COUNT);
 };
 
-const getDiscussedPhotos = (photosArray) =>
-  [...photosArray].sort((a, b) => b.comments.length - a.comments.length);
+const getDiscussedPhotos = (photos) =>
+  [...photos].sort((a, b) => b.comments.length - a.comments.length);
 
 const filterPhotos = () => {
   switch (currentFilter) {
     case FilterId.RANDOM:
-      return getRandomPhotos(photos);
+      return getRandomPhotos(loadedPhotos);
     case FilterId.DISCUSSED:
-      return getDiscussedPhotos(photos);
+      return getDiscussedPhotos(loadedPhotos);
     default:
-      return [...photos];
+      return [...loadedPhotos];
   }
 };
 
-const updateActiveButton = (clickedButton) => {
-  const activeButton = filtersForm.querySelector(`.${ACTIVE_BUTTON_CLASS}`);
-  if (activeButton) {
-    activeButton.classList.remove(ACTIVE_BUTTON_CLASS);
+const updateActiveButton = (clickedButtonNode) => {
+  const activeButtonNode = filtersFormNode.querySelector(`.${ACTIVE_BUTTON_CLASS}`);
+  if (activeButtonNode) {
+    activeButtonNode.classList.remove(ACTIVE_BUTTON_CLASS);
   }
-  clickedButton.classList.add(ACTIVE_BUTTON_CLASS);
+  clickedButtonNode.classList.add(ACTIVE_BUTTON_CLASS);
 };
 
 const debouncedRenderThumbnails = debounce(
@@ -66,13 +70,13 @@ const onFilterButtonClick = (evt) => {
 };
 
 const showFilters = () => {
-  filtersSection.classList.remove('img-filters--inactive');
+  filtersSectionNode.classList.remove('img-filters--inactive');
 };
 
-const initFilters = (loadedPhotos) => {
-  photos = loadedPhotos;
+const initFilters = (photos) => {
+  loadedPhotos = photos;
   showFilters();
-  filtersForm.addEventListener('click', onFilterButtonClick);
+  filtersFormNode.addEventListener('click', onFilterButtonClick);
 };
 
 export { initFilters };

js/data.js

@@ -14,26 +14,26 @@ const likesCountNode = bigPictureNode.querySelector('.likes-count');
 const commentsCaptionNode = bigPictureNode.querySelector('.social__caption');
 const bigPictureCancelNode = bigPictureNode.querySelector('.big-picture__cancel');
 
-const onEscKeydown = (evt) => {
+const handlers = {};
+
+handlers.onEscKeydown = (evt) => {
   if (evt.key === 'Escape') {
     evt.preventDefault();
-    clearComments();
-    bigPictureNode.classList.add('hidden');
-    document.body.classList.remove('modal-open');
-    document.removeEventListener('keydown', onEscKeydown);
+    handlers.closeBigPicture();
   }
 };
 
-const closeBigPicture = () => {
+handlers.closeBigPicture = () => {
   clearComments();
   bigPictureNode.classList.add('hidden');
   document.body.classList.remove('modal-open');
-  document.removeEventListener('keydown', onEscKeydown);
+  document.removeEventListener('keydown', handlers.onEscKeydown);
 };
 
+
 const onBigPictureCancelClick = (evt) => {
   evt.preventDefault();
-  closeBigPicture();
+  handlers.closeBigPicture();
 };
 
 const openBigPicture = (pictureId) => {
@@ -51,7 +51,7 @@ const openBigPicture = (pictureId) => {
 
   bigPictureNode.classList.remove('hidden');
   document.body.classList.add('modal-open');
-  document.addEventListener('keydown', onEscKeydown);
+  document.addEventListener('keydown', handlers.onEscKeydown);
 };
 
 bigPictureCancelNode.addEventListener('click', onBigPictureCancelClick);

js/filters.js

@@ -121,7 +121,9 @@ const onEffectsListChange = (evt) => {
     return;
   }
 
-  updateSliderOptions(evt.target.value);
+  const effectName = evt.target.value;
+  updateSliderOptions(effectName);
+  applyEffect(effectName, effectsConfig[effectName].start);
 };
 
 const onEffectLevelSliderUpdate = () => {