Помощь друга #10
Merged
Помощь друга #10
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 12, 2023
MaksimovG
suggested changes
Dec 14, 2023
js/form.js
Outdated
Comment on lines
10
to
13
| const formErorrorsMessages = { | ||
| hashTag: 'Уникальные хештеги, каждый не более 20 символов, должны быть разделены пробелом', | ||
| comment: 'Комментарий не более 140 символов' | ||
| }; |
js/image-effects.js
Outdated
| @@ -0,0 +1,58 @@ | |||
| const EFFECT = { | |||
js/image-effects.js
Outdated
| options: {range: {min: 1, max: 4}, step: 0.1, start: 4}, | ||
| } | ||
| }; | ||
| const DefaultSliderParams = { |
MaksimovG
suggested changes
Dec 15, 2023
js/form.js
Outdated
|
|
||
| const MAX_HASHTAG_LENGTH = 20; | ||
| const MAX_COMMENT_LENGTH = 140; | ||
| const MAX_HASHTAG_COUNT = 5; | ||
| const VALID_IMAGE_TYPES = ['image/gif', 'image/jpeg', 'image/png']; | ||
| const HASHTAG_RULE = /^#[А-яа-яA-za-zёЁ]{1,19}$/; | ||
| const ErrorMessage = { | ||
| hashTag: 'Уникальные хештеги, каждый не более 20 символов, должны быть разделены пробелом', |
js/image-effects.js
Outdated
Comment on lines
2
to
19
| 'none': { name: 'none', filter: '', unit: '', | ||
| options: {range: {min: 0, max: 100}, step: 1, start: 100}, | ||
| }, | ||
| 'chrome': {name: 'chrome', filter: 'grayscale', unit: '%', | ||
| options: { range: {min: 0, max: 100}, step: 1, start: 100}, | ||
| }, | ||
| 'sepia': { name: 'sepia', filter: 'sepia', unit: '%', | ||
| options: { range: {min: 0, max: 100}, step: 1, start: 100}, | ||
| }, | ||
| 'marvin': { name: 'marvin', filter: 'invert', unit: '%', | ||
| options: {range: {min: 0, max: 100}, step: 1, start: 100}, | ||
| }, | ||
| 'phobos': {name: 'phobos', filter: 'blur', unit: 'px', | ||
| options: {range: {min: 1, max: 10}, step: 0.1, start: 10}, | ||
| }, | ||
| 'heat': {name: 'heat', filter: 'brightness', unit: '', | ||
| options: {range: {min: 1, max: 4}, step: 0.1, start: 4}, | ||
| } |
js/image-effects.js
Outdated
| } | ||
| }; | ||
| const DefaultSliderParam = { | ||
| range: {min: 0, max: 100}, |
There was a problem hiding this comment.
форматирование как везде должно быть ( перенос на др строки)
js/image-effects.js
Outdated
| }; | ||
|
|
||
| export const resetFilters = () => { | ||
| image.style.filter = Effect['none'].name; |
js/image-effects.js
Outdated
| }; | ||
|
|
||
| export const onEffectsFilterChange = (evt) =>{ | ||
| const effect = evt.target.value; |
There was a problem hiding this comment.
evt.target.value.toUpperCase() - чтобы под новый формат константы соответствовать
MaksimovG
suggested changes
Dec 16, 2023
js/image-effects.js
Outdated
| range: {min: 0, max: 100}, start: 100, step: 0.1 | ||
| }; | ||
|
|
||
| const NONE = 'NONE'; |
js/image-effects.js
Outdated
Comment on lines
32
to
57
| export const createEffectSlider = () =>{ | ||
| sliderWrapper.classList.add('hidden'); | ||
| noUiSlider.create(slider, DefaultSliderParam); | ||
| }; | ||
|
|
||
| export const resetFilters = () => { | ||
| image.style.filter = Effect[NONE].name; | ||
| sliderWrapper.classList.add('hidden'); | ||
| }; | ||
|
|
||
| export const onEffectsFilterChange = (evt) =>{ | ||
| const effect = evt.target.value.toUpperCase(); | ||
| if(effect === Effect[NONE].name){ | ||
| resetFilters(); | ||
| } | ||
| else{ | ||
| sliderWrapper.classList.remove('hidden'); | ||
| image.removeAttribute('class'); | ||
| image.classList.add(`effects__preview--${effect}`); | ||
| slider.noUiSlider.updateOptions(Effect[effect].options); | ||
| slider.noUiSlider.on('update', () => { | ||
| sliderValue.value = slider.noUiSlider.get(); | ||
| image.style.filter = `${Effect[effect].filter}(${sliderValue.value}${Effect[effect].unit})`; | ||
| }); | ||
| } | ||
| }; |
There was a problem hiding this comment.
В итоге получился не модуль а файл с набором функций. Если делаете модуль, делайте его инкапсулированым, без лишго путающего и ненужного экспорта его внутренних органов ( слушателей, или каких-то функций внтуреннего жизненного цикла). Создайте функции которые запускают модуль (вешают обработчики событий, меняют классы), тормозят модуль (ставят все значения в дефолт, удаляют обработчики и тд) и возможно меняют его состояние (допустим нужно просто вернуть все в дефолт
MaksimovG
suggested changes
Dec 17, 2023
js/image-scale.js
Outdated
Comment on lines
25
to
27
| const onScaleBiggerClick = updateScale; | ||
|
|
||
| const onScaleSmallerClick = updateScale; |
There was a problem hiding this comment.
(evt) => updateScale(evt.target.dataset.value);
There was a problem hiding this comment.
и соответственно поправить updateScale
Comment on lines
+21
to
+23
| const DefaultSliderParam = { | ||
| range: {min: 0, max: 100}, start: 100, step: 0.1 | ||
| }; |
There was a problem hiding this comment.
DefaultSliderParam = {
RANGE: {min: 0, max: 100}, START: 100, STEP: 0.1
};
There was a problem hiding this comment.
к сожалению, noUiSlider не поддерживает критерии html академии
keksobot
merged commit 18af112
into
htmlacademy-univer-javascript-1:master
1 check failed
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.
🎓 Помощь друга