From 8eb68993fd234ee6db12ff98f5abeb828e50c1c0 Mon Sep 17 00:00:00 2001 From: Sergey Ivanov Date: Thu, 17 Oct 2024 22:33:58 +0300 Subject: [PATCH] =?UTF-8?q?feat:=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D1=8F=D0=B5=D1=82=20=D0=B1=D0=BB=D0=BE=D0=BA=D0=B8=D1=80=D0=BE?= =?UTF-8?q?=D0=B2=D0=BA=D1=83=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D0=B8=20?= =?UTF-8?q?=D1=84=D0=B8=D0=BB=D1=8C=D1=82=D1=80=D0=B0=20=D0=B5=D1=81=D0=BB?= =?UTF-8?q?=D0=B8=20=D0=BD=D0=B5=D1=82=20=D1=81=D0=BE=D0=B1=D1=8B=D1=82?= =?UTF-8?q?=D0=B8=D0=B9=20=D1=8D=D1=82=D0=BE=D0=B3=D0=BE=20=D1=84=D0=B8?= =?UTF-8?q?=D0=BB=D1=8C=D1=82=D1=80=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/presenter/list-presenter.js | 4 +--- src/view/filters-events-view.js | 4 +++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/presenter/list-presenter.js b/src/presenter/list-presenter.js index 65b532e..fa85625 100644 --- a/src/presenter/list-presenter.js +++ b/src/presenter/list-presenter.js @@ -35,7 +35,6 @@ export default class ListPresenter { #sortComponent = null; #currentSortType = SortType.DAY; - #filterType = FilterType.EVERYTHING; #isLoading = true; #uiBlocker = new UiBlocker({ @@ -72,9 +71,8 @@ export default class ListPresenter { } get tripPoints() { - this.#filterType = this.#filtersModel.filter; const tripPoints = this.#pointsTripModel.points; - const filteredTripPoints = filter[this.#filterType](tripPoints); + const filteredTripPoints = filter[this.#filtersModel.filter](tripPoints); switch (this.#currentSortType) { case SortType.DAY: return filteredTripPoints.sort(sortEventsByDay); diff --git a/src/view/filters-events-view.js b/src/view/filters-events-view.js index e4e9e25..7fb5bca 100644 --- a/src/view/filters-events-view.js +++ b/src/view/filters-events-view.js @@ -15,7 +15,9 @@ function createFiltersEventsTemplate(filters, currentFilterType) { type="radio" name="trip-filter" value="${filter.type}" - ${filter.type === currentFilterType && 'checked'}> + ${filter.type === currentFilterType && 'checked'} + ${filter.count === 0 ? 'disabled' : ''} + > `)).join('')}