Правда или действие #9
Merged
Conversation
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
MaksimovG
suggested changes
Dec 7, 2023
index.html
Outdated
| @@ -235,6 +235,8 @@ <h2 class="success__title">Изображение успешно загруже | |||
| <script type="module" src="js/main.js"></script> | |||
| <script type="module" src="js/thumbnails.js"></script> | |||
| <script type="module" src="js/data.js"></script> | |||
| <script type="module" src="js/form.js"></script> | |||
| <script src="pristine/Pristine-master/dist/pristine.min.js"></script> | |||
js/form.js
Outdated
| const comments = document.querySelector('.text__description'); | ||
| const rightHashtag = /^#[А-яа-яA-za-zёЁ]{1,19}$/; | ||
|
|
||
| const MAX_HASHTAG_LENGTH = 20; |
js/form.js
Outdated
| }); | ||
| const uniqueTags = new Set(hashtagsArray); | ||
|
|
||
| return (isСorrectTag && uniqueTags.size === hashtagsArray.length && hashtagsArray.length <= 5) || hashtags.value === ''; |
js/form.js
Outdated
| const MAX_HASHTAG_LENGTH = 20; | ||
|
|
||
|
|
||
| const isCorrectComment = (comment) => isRightString(comment, 140); |
js/form.js
Outdated
| } | ||
| }; | ||
|
|
||
| const onClickCancelButton = () => { |
js/form.js
Outdated
| }; | ||
|
|
||
| export const renderUploadForm = () => { | ||
| uploadButton.addEventListener('change', openOverlay); |
js/form.js
Outdated
Comment on lines
74
to
75
| comments.onkeydown = (evt) => onFocusPreventClose(evt); | ||
| hashtags.onkeydown = (evt) => onFocusPreventClose(evt); |
There was a problem hiding this comment.
мы не добавляем обработчики такими образом
MaksimovG
suggested changes
Dec 9, 2023
js/form.js
Outdated
| const MAX_HASHTAG_LENGTH = 20; | ||
| const MAX_COMMENT_LENGTH = 140; | ||
| const MAX_HASHTAG_COUNT = 5; | ||
| const validImageTypes = ['gif', 'jpeg', 'png']; |
js/form.js
Outdated
| const isPicture = () => { | ||
| const path = uploadButton.value.toLowerCase(); | ||
|
|
||
| return validImageTypes.some((type) => path.endsWith(type)); |
There was a problem hiding this comment.
вообще мы смотрим file.type и работаем с. ним, а не с путем до файла. Но можно не переделывать
MaksimovG
approved these changes
Dec 11, 2023
| const cancelButton = document.querySelector('#upload-cancel'); | ||
| const hashtags = document.querySelector('.text__hashtags'); | ||
| const comments = document.querySelector('.text__description'); | ||
| const rightHashtag = /^#[А-яа-яA-za-zёЁ]{1,19}$/; |
Comment on lines
+72
to
+73
| 'Уникальные хештеги, каждый не более 20 символов, должны быть разделены пробелом'); | ||
| pristine.addValidator(comments, isCorrectComment, 'Комментарий не более 140 символов'); |
There was a problem hiding this comment.
тексты ошибок желательно в перечисление собрать
keksobot
merged commit 60c99ff
into
htmlacademy-univer-javascript-1:master
1 check passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
🎓 Правда или действие