Правда или действие #8
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,175 @@ | ||
| import {isEscapeKey} from"./util.js"; | ||
| const imgInput = document.querySelector(".img-upload__input"); | ||
| const body = document.body; | ||
| const imgOverlay = document.querySelector(".img-upload__overlay"); | ||
| const closeImg = document.querySelector(".img-upload__cancel"); | ||
| const postForm = document.querySelector(".img-upload__form"); | ||
| const formButton = document.querySelector(".img-upload__submit"); | ||
| const pristine = new Pristine(postForm, { | ||
| classTo: "img-upload__text", | ||
| errorTextParent: "img-upload__text", | ||
| }); | ||
| const regexp = /^#[^\s#]+$/i; | ||
|
|
||
| imgInput.addEventListener("change", (evt) => { | ||
| evt.preventDefault(); | ||
| imgOverlay.classList.remove("hidden"); | ||
| body.classList.add("modal-open"); | ||
| pristine.validate(); | ||
| closeFormClick(); | ||
| // eslint-disable-next-line no-shadow | ||
| postForm.addEventListener("submit",(evt) => { | ||
| evt.preventDefault(); | ||
| formButton.disabled = true; | ||
| if(pristine.validate()){ | ||
| openSuccess(); | ||
| }else { | ||
| openError(); | ||
| } | ||
| formButton.disabled = false; | ||
| }); | ||
| }); | ||
|
|
||
| function validateHashtags (value) { | ||
| const valueTrim = value.trim(); | ||
| const hashtags = valueTrim.split(" "); | ||
| if (valueTrim === "") { | ||
| return true; | ||
| } | ||
| pristine.errorText = "введён невалидный хэш-тег"; | ||
| return hashtags.every((hashtag) => regexp.test(hashtag)); | ||
| } | ||
| function validateComment (value) { | ||
| if (value.trim() === "") { | ||
| return true; | ||
| } | ||
| return value.length <= 140; | ||
| } | ||
| const hastags = document.querySelector(".text__hashtags"); | ||
| const postText = document.querySelector(".text__description"); | ||
|
|
||
| function dublicateHashtags(value) { | ||
| const hashtags = value.trim().split(" "); | ||
| for (let i = 0; i < hashtags.length; i++){ | ||
| const hashtag = hashtags[i].toLowerCase(); | ||
| if (hashtags.slice(0, i).includes(hashtag)) { | ||
| pristine.errorText = "хэш-теги повторяются"; | ||
| return false; | ||
| } | ||
| } | ||
| return true; | ||
| } | ||
|
|
||
| pristine.addValidator( | ||
|
There was a problem hiding this comment. Так как ты навешиваешь несколько валидаций на теги, может быть сразу несколько сообщений подряд. Лучше такого избегать. То есть использовать одну функции и сообщении по какому-то приоритету показывать |
||
| hastags, | ||
| (value) => { | ||
| if (!validateHashtags(value)) { | ||
| return false; | ||
| } | ||
| if (!dublicateHashtags(value)) { | ||
| return false; | ||
| } | ||
|
|
||
| return true; | ||
| }, | ||
| () => pristine.errorText | ||
| ); | ||
|
|
||
| pristine.addValidator( | ||
| postText, | ||
| validateComment, | ||
| "комментарий не может содрежать больше 140 символов" | ||
| ); | ||
|
|
||
|
|
||
| function openSuccess (){ | ||
| const successTemplate = document.querySelector("#success").content; | ||
| const successElement = successTemplate.cloneNode(true).querySelector(".success"); | ||
| const successButton = successElement.querySelector(".success__button"); | ||
| const successInner = successElement.querySelector(".success__inner"); | ||
|
|
||
| document.body.append(successElement); | ||
| hastags.value = ""; | ||
| postText.value = ""; | ||
|
|
||
| successButton.addEventListener("click", closeSuccess); | ||
| document.addEventListener("keydown", closeSuccessEscape); | ||
| document.addEventListener("click", closeOutside); | ||
|
|
||
| function closeSuccess(){ | ||
| successElement.remove(); | ||
| document.removeEventListener("keydown",closeSuccessEscape); | ||
| document.removeEventListener("click",closeOutside); | ||
| imgOverlay.classList.add("hidden"); | ||
| body.classList.remove("modal-open"); | ||
| } | ||
|
|
||
| function closeSuccessEscape (evt){ | ||
| if(isEscapeKey(evt)) { | ||
| evt.preventDefault(); | ||
| closeSuccess(); | ||
| } | ||
|
|
||
| } | ||
| function closeOutside(evt){ | ||
| if (!successInner.contains(evt.target)){ | ||
| closeSuccess(); | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
|
||
| function openError (){ | ||
| const errorTemplate = document.querySelector("#error").content; | ||
| const errorElement = errorTemplate.cloneNode(true).querySelector(".error"); | ||
| const errorButton = errorElement.querySelector(".error__button"); | ||
| const errorInner = errorElement.querySelector(".error__inner"); | ||
|
|
||
| document.body.append(errorElement); | ||
|
|
||
|
|
||
| errorButton.addEventListener("click", closeError); | ||
| document.addEventListener("keydown", closeErrorEscape); | ||
| document.addEventListener("click", closeOutside); | ||
| document.removeEventListener("click",closeForm); | ||
|
There was a problem hiding this comment. Может без слушателя лучше, а внутрь других слушателей сложить? |
||
|
|
||
| function closeError(){ | ||
| errorElement.remove(); | ||
| document.removeEventListener("keydown",closeErrorEscape); | ||
| document.removeEventListener("click",closeOutside); | ||
| } | ||
|
|
||
| function closeErrorEscape (evt){ | ||
| if(isEscapeKey(evt)) { | ||
| evt.preventDefault(); | ||
| closeError(); | ||
| imgOverlay.classList.remove("hidden"); | ||
|
There was a problem hiding this comment. В других обработчиках нет этого, так как при нажатии на esc без этой строчки с убиранием класса hidden, у меня закрывалось и модальное окно с фотографией, а в других случаях такого не было |
||
| body.classList.add("modal-open"); | ||
| } | ||
|
|
||
| } | ||
| function closeOutside(evt){ | ||
| if (!errorInner.contains(evt.target)){ | ||
| closeError(); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| function closeForm(){ | ||
|
There was a problem hiding this comment. На закрытие нужно обнулять состояния и скидывать загруженное фото. Сейчас странно работает. Если закрыть через кнопку, то можно загрузить тоже фото, если закрыть через esc, тоже фото нельзя загрузить - оно не сбрасывается из инпута скорее всего. Плюс слушатели закрытия на закрытие нужно удалять There was a problem hiding this comment. Теперь удаляю форму и слушатель на закрытие |
||
| imgOverlay.classList.add("hidden"); | ||
| body.classList.remove("modal-open"); | ||
| postForm.reset(); | ||
| document.removeEventListener(closeFormClick); | ||
| } | ||
|
|
||
| function closeFormClick (){ | ||
| closeImg.addEventListener("click",closeForm); | ||
| document.addEventListener("keydown", (evt) => { | ||
| if (isEscapeKey(evt)) { | ||
| evt.preventDefault(); | ||
| closeForm(); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,5 @@ | ||
| import {renderPosts} from"./posts-rendering.js"; | ||
| import "./form-filling.js"; | ||
| import {loadPhoto} from "./photo-load.js"; | ||
| renderPosts(); | ||
| loadPhoto(); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| import {FILE_TYPES} from "./constants.js"; | ||
| function loadPhoto(){ | ||
| const imgInput = document.querySelector(".img-upload__input"); | ||
| const preview = document.querySelector(".img-upload__preview img"); | ||
|
|
||
| imgInput.addEventListener("change", () => { | ||
| const file = imgInput.files[0]; | ||
| const fileName = file.name.toLowerCase(); | ||
| const matches = FILE_TYPES.some((it) => fileName.endsWith(it)); | ||
| if(matches){ | ||
| preview.src = URL.createObjectURL(file); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| export{loadPhoto}; |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Почему нельзя все это сделать в одном событии? Сейчас неочевидна логика работы(
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Надеюсь правильно поняла, теперь у меня в слушателе для input вызываются слушатели на другие кнопки