From ebe00bdc314cb3387e6d71a0573fd20cd56eca15 Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Tue, 21 Apr 2020 11:45:38 +0200 Subject: [PATCH] Update filters clear button functionality --- .../darkswarm/controllers/products_controller.js.coffee | 3 +++ app/views/shop/products/_form.html.haml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee b/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee index 51e02ac2b4..b1004b132d 100644 --- a/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee +++ b/app/assets/javascripts/darkswarm/controllers/products_controller.js.coffee @@ -85,6 +85,9 @@ Darkswarm.controller "ProductsCtrl", ($scope, $filter, $rootScope, Products, Ord $scope.clearAll = -> $scope.query = "" + $scope.clearFilters() + + $scope.clearFilters = -> $scope.taxonSelectors.clearAll() $scope.propertySelectors.clearAll() diff --git a/app/views/shop/products/_form.html.haml b/app/views/shop/products/_form.html.haml index e9beb73658..a91ea0cb7a 100644 --- a/app/views/shop/products/_form.html.haml +++ b/app/views/shop/products/_form.html.haml @@ -52,7 +52,7 @@ = render partial: "shop/products/filters" .sidebar-footer - %button{type: 'button', ng: {click: 'clearAll() && toggleFilterSidebar()'}} + %button{type: 'button', ng: {click: 'clearFilters()'}} = t(:products_filter_clear) %button.done{type: 'button', ng: {click: 'toggleFilterSidebar()'}} = t(:products_filter_done)