Merge pull request #21 from YouAreNotReady/master

Author: keksobot

Diff for: js/comments-loader.js

@@ -36,21 +36,25 @@ const showNextComments = () => {
   currentCommentsCount += SHOW_COMMENTS_STEP;
 };
 
+const showMoreButtonClickHandler = () => {
+  showNextComments();
+};
+
 const showComments = (comments) => {
   commentsList.innerHTML = '';
   currentComments = comments;
   imageShownComments.textContent = currentCommentsCount + SHOW_COMMENTS_STEP;
   imageTotalComments.textContent = comments.length;
   showNextComments();
-  commentsShowMoreButton.addEventListener('click', showNextComments);
+  commentsShowMoreButton.addEventListener('click', showMoreButtonClickHandler);
 };
 
 
 const clearComments = () => {
   currentComments = [];
   currentCommentsCount = 0;
   commentsShowMoreButton.classList.remove('hidden');
-  commentsShowMoreButton.removeEventListener('click', showNextComments);
+  commentsShowMoreButton.removeEventListener('click', showMoreButtonClickHandler);
 };
 
 export { showComments, clearComments};

Diff for: js/hashtag-validation.js

@@ -1,19 +1,19 @@
-const hashtag = /^#[a-zа-яё0-9]{1,19}$/i;
+const HASHTAG = /^#[a-zа-яё0-9]{1,19}$/i;
 
 const validateHashtag = (value) => {
-  const hashtagArray = value.split(/\s+/);
-  return hashtagArray.every((el) => hashtag.test(el));
+  const hashtagsArray = value.split(/\s+/);
+  return hashtagsArray.every((el) => HASHTAG.test(el));
 };
 
 const checkForRepeatingHashtag = (value) => {
-  const hashtagArray = value.toLowerCase().split(/\s+/);
-  const checkSet = new Set(hashtagArray);
-  return checkSet.size === hashtagArray.length;
+  const hashtagsArray = value.toLowerCase().split(/\s+/);
+  const checkSet = new Set(hashtagsArray);
+  return checkSet.size === hashtagsArray.length;
 };
 
 const checkForHashtagCount = (value) => {
-  const hashtagArray = value.split(/\s+/);
-  return hashtagArray.length <= 5;
+  const hashtagsArray = value.split(/\s+/);
+  return hashtagsArray.length <= 5;
 };
 
 const validateAllHashtags = (value) => {
@@ -32,11 +32,7 @@ const validateAllHashtags = (value) => {
   }
 
   const countValidation = checkForHashtagCount(value);
-  if (!countValidation) {
-    return false;
-  }
-
-  return true;
+  return countValidation;
 };
 
 const validateHashtagError = (value) => {

Diff for: js/image-upload.js

@@ -36,7 +36,7 @@ const documentKeydownHandler = (evt) => {
   if (isEscapeKey(evt)) {
     evt.preventDefault();
     uploadFormCloseHandler();
-    imageUploadForm.removeEventListener('keydown', uploadFormNoEscWhenInputActive);
+    imageUploadForm.removeEventListener('keydown', uploadFormInputsEscKeydownHandler);
     imageUploadCloseButton.removeEventListener('click', uploadFormCloseHandler);
   }
 };
@@ -62,7 +62,7 @@ function uploadFormCloseHandler() {
   imageUploadCloseButton.removeEventListener('click', uploadFormCloseHandler);
 }
 
-function uploadFormNoEscWhenInputActive(evt) {
+function uploadFormInputsEscKeydownHandler(evt) {
   if(isEscapeKey(evt) && (evt.target === hashtagsInput || evt.target === commentInput)) {
     evt.stopPropagation();
   }
@@ -83,7 +83,7 @@ imageUploadInput.addEventListener('change', ()=> {
   imageUploadOverlay.classList.remove('hidden');
   document.body.classList.add('modal-open');
 
-  imageUploadForm.addEventListener('keydown', uploadFormNoEscWhenInputActive);
+  imageUploadForm.addEventListener('keydown', uploadFormInputsEscKeydownHandler);
   imageUploadCloseButton.addEventListener('click', uploadFormCloseHandler);
   document.addEventListener('keydown', documentKeydownHandler);
 });
@@ -103,7 +103,7 @@ const imageUploadSubmitHandler = async (evt) => {
     }
   }
 
-  imageUploadForm.removeEventListener('keydown', uploadFormNoEscWhenInputActive);
+  imageUploadForm.removeEventListener('keydown', uploadFormInputsEscKeydownHandler);
   imageUploadCloseButton.removeEventListener('click', uploadFormCloseHandler);
 };
 

Diff for: js/show-image-fullscreen.js

@@ -23,10 +23,14 @@ function closeImagePopup() {
 
   clearComments();
 
-  imageCloseButton.removeEventListener('click', closeImagePopup);
+  imageCloseButton.removeEventListener('click', imageCloseButtonClickHandler);
   document.removeEventListener('keydown', documentKeydownHandler);
 }
 
+function imageCloseButtonClickHandler() {
+  closeImagePopup();
+}
+
 const openImagePopup = (imageData) => {
   document.body.classList.add('modal-open');
 
@@ -35,7 +39,7 @@ const openImagePopup = (imageData) => {
   image.querySelector('img').src = imageData.url;
   imageLikesCount.textContent = imageData.likes;
   imageDescription.textContent = imageData.description;
-  imageCloseButton.addEventListener('click', closeImagePopup);
+  imageCloseButton.addEventListener('click', imageCloseButtonClickHandler);
 
   showComments(imageData.comments);