Skip to content

Commit

Permalink
добавлен debounce и фикс сброса выбранного эффекта
Browse files Browse the repository at this point in the history
  • Loading branch information
Наташа committed Jul 5, 2018
1 parent f5f402c commit c539b1c
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 11 deletions.
19 changes: 9 additions & 10 deletions js/gallery.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,14 @@
gallery.querySelector('.likes-count').textContent = photo.likes;
gallery.querySelector('.comments-count').textContent = photo.comments.length;

// Спрячьте блоки - это по заданию module3-task1, пятый пункт
gallery.querySelector('.social__comment-count').classList.add('visually-hidden');
gallery.querySelector('.social__loadmore').classList.add('visually-hidden');
};

var openGallery = function () {
document.querySelector('body').classList.add('modal-open');
gallery.classList.remove('hidden');
document.addEventListener('keydown', galleryEscPress); // включаем отслеживание Esc
document.addEventListener('keydown', galleryEscPress);

var galleryCloseBtn = document.querySelector('.big-picture__cancel');
galleryCloseBtn.addEventListener('click', closeGallery);
Expand Down Expand Up @@ -123,19 +122,14 @@
}
};


filterBtns.forEach(function (btn) {
btn.addEventListener('click', switchFilter);
});

var clearPictures = function () {
var photosList = picturesSection.querySelectorAll('.picture__link');
photosList.forEach(function (item) {
item.parentNode.removeChild(item);
});
};

var switchFilter = function (evt) {
var switchFilter = window.utils.debounce(function (evt) {
var photos = picturesData.slice(0);
var currentBtn = evt.target;
var currentFilter = currentBtn.id;
Expand All @@ -150,9 +144,14 @@
clearPictures();
appendPictures(photos);
}
};
}, 500);

filterBtns.forEach(function (btn) {
btn.addEventListener('click', switchFilter);
});


// получаем данные с сервера
// --- получаем данные с сервера
var onSuccess = function (data) {
picturesData = data;
// при получении добавляю id в массив для открытия большого фото
Expand Down
4 changes: 4 additions & 0 deletions js/upload.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
var uploadSubmit = uploadForm.querySelector('.img-upload__submit');
var hashtagsInput = uploadForm.querySelector('.text__hashtags');
var descriptionInput = uploadForm.querySelector('.text__description');
var defaultEffect = uploadForm.querySelector('#effect-none');

var MAX_HASHTAGS = 5;
var MAX_HASHTAG_LENGTH = 20;
Expand Down Expand Up @@ -143,10 +144,13 @@
clearErrorText();
hashtagsInput.value = '';
descriptionInput.value = '';
defaultEffect.checked = true;
};

window.upload = {
reset: resetForm,
repeat: onSubmitClick
};
})();


17 changes: 16 additions & 1 deletion js/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,24 @@
return array;
};

var debounce = function (func, wait, context) {
var timer;
return function () {
var args = arguments;
clearTimeout(timer);

var later = function () {
func.apply(context, args);
timer = null;
};
timer = setTimeout(later, wait);
};
};

window.utils = {
isEscEvent: isEscEvent,
getRandomNum: getRandomNum,
getShuffled: getShuffled
getShuffled: getShuffled,
debounce: debounce
};
})();

0 comments on commit c539b1c

Please sign in to comment.