diff --git a/app/assets/javascripts/darkswarm/controllers/producers_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/producers_controller.js.coffee index 61d1960aef..3b8152dca3 100644 --- a/app/assets/javascripts/darkswarm/controllers/producers_controller.js.coffee +++ b/app/assets/javascripts/darkswarm/controllers/producers_controller.js.coffee @@ -2,6 +2,7 @@ Darkswarm.controller "ProducersCtrl", ($scope, Producers, $filter, FilterSelecto $scope.Producers = Producers $scope.totalActive = FilterSelectorsService.totalActive $scope.clearAll = FilterSelectorsService.clearAll + $scope.filterText = FilterSelectorsService.filterText $scope.filtersActive = true $scope.activeTaxons = [] $scope.query = Search.search() diff --git a/app/assets/javascripts/darkswarm/services/filter_selectors.js.coffee b/app/assets/javascripts/darkswarm/services/filter_selectors.js.coffee index d9c6848880..92aa780b8a 100644 --- a/app/assets/javascripts/darkswarm/services/filter_selectors.js.coffee +++ b/app/assets/javascripts/darkswarm/services/filter_selectors.js.coffee @@ -13,6 +13,12 @@ Darkswarm.factory "FilterSelectorsService", -> selector.active .length + filterText: (active)=> + if @totalActive() == 0 + if active then "Hide filters" else "Filter by" + else + "#{@totalActive()} filters active" + clearAll: => for selector in @selectors selector.active = false diff --git a/app/views/producers/_filters.html.haml b/app/views/producers/_filters.html.haml index 8957132423..fd14ccd3e3 100644 --- a/app/views/producers/_filters.html.haml +++ b/app/views/producers/_filters.html.haml @@ -1,18 +1,9 @@ .row .small-12.columns %a.right{"ng-click" => "filtersActive = !filtersActive"} - %span{"ng-show" => "!filtersActive && totalActive() == 0"} - Filter by - %i.ofn-i_052-point-down - - %span{"ng-show" => "filtersActive && totalActive() == 0"} - Hide filters - %i.ofn-i_053-point-up - - %span{"ng-show" => "totalActive() > 0"} - {{ totalActive() }} filters applied - %i.ofn-i_052-point-down{"ng-show" => "!filtersActive"} - %i.ofn-i_053-point-up{"ng-show" => "filtersActive"} + {{ filterText(filtersActive) }} + %i.ofn-i_052-point-down{"ng-show" => "!filtersActive"} + %i.ofn-i_053-point-up{"ng-show" => "filtersActive"} .row.animate-show{"ng-show" => "filtersActive"} .small-12.columns