Merge pull request #16 from NoaVel/master

Author: keksobot

js/filters.js

@@ -18,12 +18,12 @@ let currentFilter = FilterId.DEFAULT;
 let loadedPhotos = [];
 
 const getRandomPhotos = (photos) => {
-  const shuffled = [...photos];
-  for (let i = shuffled.length - 1; i > 0; i--) {
+  const shuffledPhotos = [...photos];
+  for (let i = shuffledPhotos.length - 1; i > 0; i--) {
     const j = Math.floor(Math.random() * (i + 1));
-    [shuffled[i], shuffled[j]] = [shuffled[j], shuffled[i]];
+    [shuffledPhotos[i], shuffledPhotos[j]] = [shuffledPhotos[j], shuffledPhotos[i]];
   }
-  return shuffled.slice(0, RANDOM_PHOTOS_COUNT);
+  return shuffledPhotos.slice(0, RANDOM_PHOTOS_COUNT);
 };
 
 const getDiscussedPhotos = (photos) =>

js/render-comments.js

@@ -45,12 +45,16 @@ const renderNextComments = () => {
   }
 };
 
+const onCommentsLoaderClick = () => {
+  renderNextComments();
+};
+
 const clearComments = () => {
   state.currentCount = 0;
   state.comments = [];
   socialCommentsNode.innerHTML = '';
   commentsLoaderNode.classList.add('hidden');
-  commentsLoaderNode.removeEventListener('click', renderNextComments);
+  commentsLoaderNode.removeEventListener('click', onCommentsLoaderClick);
 };
 
 const renderComments = (currentPhotoComments) => {
@@ -59,11 +63,11 @@ const renderComments = (currentPhotoComments) => {
   socialCommentsNode.innerHTML = '';
 
   commentsCountNode.classList.remove('hidden');
-  commentsLoaderNode.removeEventListener('click', renderNextComments);
+  commentsLoaderNode.removeEventListener('click', onCommentsLoaderClick);
 
   if (state.comments.length > COUNT_STEP) {
     commentsLoaderNode.classList.remove('hidden');
-    commentsLoaderNode.addEventListener('click', renderNextComments);
+    commentsLoaderNode.addEventListener('click', onCommentsLoaderClick);
   } else {
     commentsLoaderNode.classList.add('hidden');
   }

js/upload-photo-form.js

@@ -67,7 +67,7 @@ const resetUploadPhotoForm = () => {
   resetPreview();
 };
 
-const stopEscapePropagation = (evt) => {
+const onTextInputKeydown = (evt) => {
   if (isEscapeKey(evt)) {
     evt.stopPropagation();
   }
@@ -184,8 +184,8 @@ const initUploadPhotoForm = () => {
   uploadFileControlNode.addEventListener('change', onUploadFileControlChange);
   uploadCancelButtonNode.addEventListener('click', onUploadCancelButtonClick);
   uploadFormNode.addEventListener('submit', onUploadFormSubmit);
-  hashtagsInputNode.addEventListener('keydown', stopEscapePropagation);
-  descriptionInputNode.addEventListener('keydown', stopEscapePropagation);
+  hashtagsInputNode.addEventListener('keydown', onTextInputKeydown);
+  descriptionInputNode.addEventListener('keydown', onTextInputKeydown);
 };
 
 export { initUploadPhotoForm };