Исправления ошибок после проверки

MaksimRozov · Apr 5, 2024 · bfc74af · bfc74af
1 parent e0fc6a7
commit bfc74af
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 13 deletions.
diff --git a/js/api/get-data-variables.js b/js/api/get-data-variables.js
@@ -2,7 +2,7 @@ export const dataErrorTemplate = document.querySelector('#data-error').content.q
 export const sendErrorTemplate = document.querySelector('#error').content.querySelector('.error');
 export const sendFormErrorTemplate = document.querySelector('#success').content.querySelector('.success');
 export const SHOW_ERROR_TIME = 5000;
-export const BASE_URL = 'https://31.javascript.htmlacademy.pro/kekstagram';
+export const BASE_URL = 'https://31.javascript.htmlacademy.pro/kekstagra';
 export const Route = {
   GET_DATA: '/data',
   SEND_DATA: '/',

diff --git a/js/api/secondary-functions.js b/js/api/secondary-functions.js
@@ -1,12 +1,14 @@
 import {onCloseChangePhotoEsc} from '../upload-photo';
 import {dataErrorTemplate, sendErrorTemplate, sendFormErrorTemplate, SHOW_ERROR_TIME, submitButtonText} from './get-data-variables';
+import {isEscapeKey} from '../util';
 
 const submitButton = document.querySelector('.img-upload__submit');
 
 function onSendSuccessClose() {
   const successMessage = document.querySelector('.success');
   successMessage.remove();
   document.removeEventListener('click', onClickOutModalSuccess);
+  document.removeEventListener('keydown', onSendSuccessMessageCloseEsc);
 }
 
 const onSendErrorMessageClose = () => {
@@ -31,14 +33,14 @@ function onClickOutModalError (evt) {
   onSendErrorMessageClose();
 }
 
-function onSendErrorMessageCloseEsc (evt) {
-  if (evt.key === 'Escape') {
+function onSendErrorMessageCloseEsc () {
+  if (isEscapeKey) {
     onSendErrorMessageClose();
   }
 }
 
-function onSendSuccessMessageCloseEsc (evt) {
-  if (evt.key === 'Escape') {
+function onSendSuccessMessageCloseEsc () {
+  if (isEscapeKey) {
     onSendSuccessClose();
   }
 }

diff --git a/js/filters/index.js b/js/filters/index.js
@@ -11,7 +11,7 @@ const showFilterPanel = () => {
 
 const debounceRender = debounce(addPhotoThumbnailsUsers);
 
-const setActiveFilter = (evt) => {
+const onSetActiveFilter = (evt) => {
   const target = evt.target;
   const activeButton = document.querySelector('.img-filters__button--active');
 
@@ -44,7 +44,7 @@ function filterChange () {
 }
 
 const listenerButtonsFilter = (photos) => {
-  filtersControlPanel.addEventListener('click', setActiveFilter);
+  filtersControlPanel.addEventListener('click', onSetActiveFilter);
   showFilterPanel();
   puctures = photos;
 };

diff --git a/js/show-large-picture/elementVariables.js b/js/show-large-picture/elementVariables.js
@@ -1,5 +1,5 @@
 export const bigPictureBlock = document.querySelector('.big-picture');
-export const bigPictureCancel = document.querySelector('.big-picture__cancel');
+export const bigPictureCancel = bigPictureBlock.querySelector('.big-picture__cancel');
 export const bigPictureImg = bigPictureBlock.querySelector('.big-picture__img img');
 export const likesCount = bigPictureBlock.querySelector('.likes-count');
 export const commentTotalCount = bigPictureBlock.querySelector('.social__comment-total-count');

diff --git a/js/show-large-picture/index.js b/js/show-large-picture/index.js
@@ -1,6 +1,6 @@
 import { bigPictureBlock, bigPictureCancel, bigPictureImg, likesCount, commentTotalCount, socialCaption, socialCommentsList, buttonShowMore} from './elementVariables';
 import {renderComments, onShowMoreComments} from './createComments';
-import {toggleClass} from '../util';
+import {toggleClass, isEscapeKey} from '../util';
 
 const onCloseBigPicture = () => {
   toggleClass(bigPictureBlock, false);
@@ -28,7 +28,7 @@ const onOpenBigPicture = (element) => {
 };
 
 function onCloseBigPictureEsc(evt){
-  if(evt.key === 'Escape'){
+  if(isEscapeKey){
     evt.preventDefault();
     onCloseBigPicture();
   }

diff --git a/js/upload-photo/index.js b/js/upload-photo/index.js
@@ -1,4 +1,4 @@
-import {toggleClass} from '../util';
+import {toggleClass, isEscapeKey} from '../util';
 import {pristine} from '../validation-form';
 import {imgUploadInput, imgUpoadOverlay, imgUploadancel, effectsPreview, effectLevelSliderParrent, uploadPreviewImage, FILE_TYPES} from './uploadPhotoVariables';
 import {inputTextHashtag, commentForm, imgUploadForm} from '../validation-form';
@@ -15,7 +15,7 @@ const onCloseChangePhoto = () => {
 };
 
 function onCloseChangePhotoEsc(evt){
-  if (evt.key === 'Escape' && !(document.activeElement === inputTextHashtag || document.activeElement === commentForm)) {
+  if (isEscapeKey && !(document.activeElement === inputTextHashtag || document.activeElement === commentForm)) {
     onCloseChangePhoto();
   } else {
     evt.stopPropagation();

diff --git a/js/util/index.js b/js/util/index.js
@@ -30,4 +30,6 @@ const debounce = (callback, timeoutDelay = TIMEOUT_DELAY_DEBOUNCE) => {
   };
 };
 
-export {getRandomInteger, createId, getRandomArrayElement, toggleClass, debounce};
+const isEscapeKey = (evt) => evt.key === 'Escape';
+
+export {getRandomInteger, createId, getRandomArrayElement, toggleClass, debounce, isEscapeKey};