Skip to content

Commit 930f223

Browse files
committed
fix: fixes naming after review
1 parent c0f8df7 commit 930f223

8 files changed

Lines changed: 30 additions & 38 deletions

File tree

js/ui/big-picture/comments.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,17 @@ const resetComments = (newComments = []) => {
6060
commentsLoader.classList.remove('hidden');
6161
};
6262

63+
const onCommentsLoaderClick = () => {
64+
renderComments();
65+
};
66+
6367
const initCommentsLoader = () => {
6468
if (isLoaderInitialized) {
6569
return;
6670
}
6771
isLoaderInitialized = true;
6872

69-
commentsLoader.addEventListener('click', renderComments);
73+
commentsLoader.addEventListener('click', onCommentsLoaderClick);
7074
};
7175

7276
export {

js/ui/form/filter.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ const Filter = {
66
DISCUSSED: 'filter-discussed',
77
};
88

9-
const shuffle = (array) => {
10-
const result = [...array];
9+
const shuffle = (items) => {
10+
const shuffledItems = [...items];
1111

12-
for (let i = result.length - 1; i > 0; i--) {
12+
for (let i = shuffledItems.length - 1; i > 0; i--) {
1313
const j = Math.floor(Math.random() * (i + 1));
14-
[result[i], result[j]] = [result[j], result[i]];
14+
[shuffledItems[i], shuffledItems[j]] = [shuffledItems[j], shuffledItems[i]];
1515
}
1616

17-
return result;
17+
return shuffledItems;
1818
};
1919

2020
const filterPictures = (pictures, filterType) => {

js/ui/form/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ const initForm = () => {
1515
initScale();
1616
initEffects();
1717
initSubmit({
18-
success: () => {
18+
handleSuccess: () => {
1919
hideModal();
2020
showSuccessMessage();
2121
},
22-
error: () => {
22+
handleError: () => {
2323
showErrorMessage();
2424
},
2525
});

js/ui/form/modal.js

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,19 @@ const hideModal = () => {
3535
}
3636
};
3737

38+
const onFileFieldChange = () => {
39+
showModal();
40+
};
41+
42+
const onCancelButtonClick = () => {
43+
hideModal();
44+
};
45+
3846
const initModal = (cb) => {
3947
onCloseCallback = cb;
4048

41-
fileField.addEventListener('change', showModal);
42-
cancelButton.addEventListener('click', hideModal);
49+
fileField.addEventListener('change', onFileFieldChange);
50+
cancelButton.addEventListener('click', onCancelButtonClick);
4351
};
4452

4553
const isTextFieldFocused = () =>

js/ui/form/submit.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ const onFormSubmit = async (evt) => {
4141
}
4242
};
4343

44-
const initSubmit = ({ success, error }) => {
45-
onSuccess = success;
46-
onError = error;
44+
const initSubmit = ({ handleSuccess, handleError }) => {
45+
onSuccess = handleSuccess;
46+
onError = handleError;
4747

4848
form.addEventListener('submit', onFormSubmit);
4949
};

js/ui/messages.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,11 @@ const showMessage = (template, buttonSelector) => {
5757
}
5858
}
5959

60-
closeButton.addEventListener('click', removeMessage);
60+
const onCloseButtonClick = () => {
61+
removeMessage();
62+
};
63+
64+
closeButton.addEventListener('click', onCloseButtonClick);
6165
document.addEventListener('keydown', onKeydown);
6266
document.addEventListener('click', onOutsideClick);
6367
};

js/utils/id-generator.js

Lines changed: 0 additions & 10 deletions
This file was deleted.

js/utils/random.js

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)