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

elviraSolov · Feb 13, 2023 · 61a30f8 · 61a30f8
1 parent 3719ed8
commit 61a30f8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 17 deletions.
diff --git a/js/api.js b/js/api.js
@@ -1,5 +1,5 @@
 const getData = (onSuccess) => {
-    fetch('https://25.javascript.pages.academy/kekstagram/data')
+  fetch('https://25.javascript.pages.academy/kekstagram/data')
     .then((response) => response.json())
     .then((posts) => {
       onSuccess(posts);
@@ -21,7 +21,7 @@ const sendData = (onSuccess, onFail, body) => {
     })
     .catch((err) => {
       onFail(err.message);
-  });
+    });
 };
 
 export { getData, sendData };
diff --git a/js/form.js b/js/form.js
@@ -16,14 +16,26 @@ const MIN_HASHTAG_LENGTH = 2;
 const MAX_HASHTAG_LENGTH = 20;
 const UNVALID_SYMBOLS = /[^a-zA-Z0-9а-яА-ЯёЁ]/g;
 
+const closeUploadOverlay = () => {
+  form.reset();
+  pristine.reset();
+  uploadOverlay.classList.add('hidden');
+  body.classList.remove('modal-open');
+  document.removeEventListener('keydown', onEscKeydown);
+};
+
+const isTextFieldFocused = () =>
+  document.activeElement === hashtags ||
+  document.activeElement === comment;
+
 const onEscKeydown = (evt) => {
   if (isEscapeKey(evt) && !isTextFieldFocused()) {
     evt.preventDefault();
     closeUploadOverlay();
   }
 };
 
-let pristine = new Pristine(form, {
+const pristine = new Pristine(form, {
   classTo: 'img-upload__element',
   errorTextParent: 'img-upload__element',
   errorTextClass: 'img-upload__error'
@@ -35,18 +47,6 @@ const openUploadOverlay = () => {
   document.addEventListener('keydown', onEscKeydown);
 };
 
-const closeUploadOverlay = () => {
-  form.reset();
-  pristine.reset();
-  uploadOverlay.classList.add('hidden');
-  body.classList.remove('modal-open');
-  document.removeEventListener('keydown', onEscKeydown);
-};
-
-const isTextFieldFocused = () =>
-  document.activeElement === hashtags ||
-  document.activeElement === comment;
-
 const startsWithHash = (string) => string[0] === '#';
 
 const hasValidLength = (string) =>

diff --git a/js/picture-editing.js b/js/picture-editing.js
@@ -63,6 +63,7 @@ const EFFECTS = [
 
 const DEFAULT_EFFECT = EFFECTS[0];
 let chosenEffect = DEFAULT_EFFECT;
+const isDefault = () => chosenEffect === DEFAULT_EFFECT;
 
 noUiSlider.create(slider, {
   range: {
@@ -98,8 +99,6 @@ const onFormChange = (evt) => {
   updateSlider(chosenEffect);
 };
 
-const isDefault = () => chosenEffect === DEFAULT_EFFECT;
-
 const onSliderUpdate = () => {
   image.style.filter = 'none';
   image.className = '';