diff --git a/js/build.templates.js b/js/build.templates.js index eadd81b1..7efd0da0 100644 --- a/js/build.templates.js +++ b/js/build.templates.js @@ -23,7 +23,7 @@ this["Fliplet"]["Widget"]["Templates"]["templates.build.agenda-dates-loop"] = Ha },"useData":true}); this["Fliplet"]["Widget"]["Templates"]["templates.build.agenda-filters"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { - return "{{#if filtersInOverlay}}\n
\n {{#each filters}}\n
\n
\n

\n \n {{[name]}}\n \n \n

\n
\n
\n
\n
\n {{#each [data]}}\n
{{[name]}}
\n {{/each}}\n
\n
\n
\n
\n {{/each}}\n
\n{{else}}\n {{#each filters}}\n
Filter by {{[name]}}
\n
\n
\n
\n {{#each [data]}}\n
{{[name]}}
\n {{/each}}\n
\n
\n
\n {{/each}}\n{{/if}}"; + return "{{#if filtersInOverlay}}\n
\n {{#each filters}}\n
\n
\n

\n \n {{[name]}}\n \n \n \n

\n
\n
\n
\n
\n {{#each [data]}}\n
{{[name]}}
\n {{/each}}\n
\n
\n
\n
\n {{/each}}\n
\n{{else}}\n {{#each filters}}\n
Filter by {{[name]}}
\n
\n
\n
\n {{#each [data]}}\n
{{[name]}}
\n {{/each}}\n
\n
\n
\n {{/each}}\n{{/if}}"; },"useData":true}); this["Fliplet"]["Widget"]["Templates"]["templates.build.news-feed-base"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { @@ -39,7 +39,7 @@ this["Fliplet"]["Widget"]["Templates"]["templates.build.news-feed-detail"] = Han },"useData":true}); this["Fliplet"]["Widget"]["Templates"]["templates.build.news-feed-filters"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { - return "{{#if filtersInOverlay}}\n
\n {{#each filters}}\n
\n
\n

\n \n {{[name]}}\n \n \n

\n
\n
\n
\n
\n {{#each [data]}}\n
{{[name]}}
\n {{/each}}\n
\n
\n
\n
\n {{/each}}\n
\n{{else}}\n {{#each filters}}\n
Filter by {{[name]}}
\n
\n
\n
\n {{#each [data]}}\n
{{[name]}}
\n {{/each}}\n
\n
\n
\n {{/each}}\n{{/if}}"; + return "{{#if filtersInOverlay}}\n
\n {{#each filters}}\n
\n
\n

\n \n {{[name]}}\n \n \n \n

\n
\n
\n
\n
\n {{#each [data]}}\n
{{[name]}}
\n {{/each}}\n
\n
\n
\n
\n {{/each}}\n
\n{{else}}\n {{#each filters}}\n
Filter by {{[name]}}
\n
\n
\n
\n {{#each [data]}}\n
{{[name]}}
\n {{/each}}\n
\n
\n
\n {{/each}}\n{{/if}}"; },"useData":true}); this["Fliplet"]["Widget"]["Templates"]["templates.build.news-feed-loop"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { @@ -67,7 +67,7 @@ this["Fliplet"]["Widget"]["Templates"]["templates.build.simple-list-detail"] = H },"useData":true}); this["Fliplet"]["Widget"]["Templates"]["templates.build.simple-list-filters"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { - return "{{#if filtersInOverlay}}\n
\n {{#each filters}}\n
\n
\n

\n \n {{[name]}}\n \n \n

\n
\n
\n
\n
\n {{#each [data]}}\n
{{[name]}}
\n {{/each}}\n
\n
\n
\n
\n {{/each}}\n
\n{{else}}\n {{#each filters}}\n {{#if data.length}}\n
Filter by {{[name]}}
\n
\n
\n
\n {{#each [data]}}\n
{{[name]}}
\n {{/each}}\n
\n
\n
\n {{/if}}\n {{/each}}\n{{/if}}"; + return "{{#if filtersInOverlay}}\n
\n {{#each filters}}\n
\n
\n

\n \n {{[name]}}\n \n \n \n

\n
\n
\n
\n
\n {{#each [data]}}\n
{{[name]}}
\n {{/each}}\n
\n
\n
\n
\n {{/each}}\n
\n{{else}}\n {{#each filters}}\n {{#if data.length}}\n
Filter by {{[name]}}
\n
\n
\n
\n {{#each [data]}}\n
{{[name]}}
\n {{/each}}\n
\n
\n
\n {{/if}}\n {{/each}}\n{{/if}}"; },"useData":true}); this["Fliplet"]["Widget"]["Templates"]["templates.build.simple-list-loop"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { @@ -91,7 +91,7 @@ this["Fliplet"]["Widget"]["Templates"]["templates.build.small-card-detail"] = Ha },"useData":true}); this["Fliplet"]["Widget"]["Templates"]["templates.build.small-card-filters"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { - return "{{#if filtersInOverlay}}\n
\n {{#each filters}}\n
\n
\n

\n \n {{[name]}}\n \n \n

\n
\n
\n
\n
\n {{#each [data]}}\n
{{[name]}}
\n {{/each}}\n
\n
\n
\n
\n {{/each}}\n
\n{{else}}\n {{#each filters}}\n
Filter by {{[name]}}
\n
\n
\n
\n {{#each [data]}}\n
{{[name]}}
\n {{/each}}\n
\n
\n
\n {{/each}}\n{{/if}}\n"; + return "{{#if filtersInOverlay}}\n
\n {{#each filters}}\n
\n
\n

\n \n {{[name]}}\n \n \n \n

\n
\n
\n
\n
\n {{#each [data]}}\n
{{[name]}}
\n {{/each}}\n
\n
\n
\n
\n {{/each}}\n
\n{{else}}\n {{#each filters}}\n
Filter by {{[name]}}
\n
\n
\n
\n {{#each [data]}}\n
{{[name]}}
\n {{/each}}\n
\n
\n
\n {{/each}}\n{{/if}}\n"; },"useData":true}); this["Fliplet"]["Widget"]["Templates"]["templates.build.small-card-loop"] = Handlebars.template({"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { diff --git a/js/layout-javascript/agenda-code.js b/js/layout-javascript/agenda-code.js index be04c9df..7c650c12 100644 --- a/js/layout-javascript/agenda-code.js +++ b/js/layout-javascript/agenda-code.js @@ -110,6 +110,14 @@ DynamicList.prototype.toggleFilterElement = function (target, toggle) { } else { this.$container.find('.clear-filters').addClass('hidden'); } + + // Add number of filters applied + var filterHolder = $target.parents('.agenda-filters-panel'); + var filterName = filterHolder.find('.panel-title-text').text().trim(); + var activeFilters = this.getActiveFilters()[filterName]; + var numberOfFiltersText = !!activeFilters ? '(' + activeFilters.length + ')' : ''; + + filterHolder.find('.filter-number').text(numberOfFiltersText); }; DynamicList.prototype.clearFilters = function () { diff --git a/js/layout-javascript/news-feed-code.js b/js/layout-javascript/news-feed-code.js index f5b348b7..32c1a03d 100644 --- a/js/layout-javascript/news-feed-code.js +++ b/js/layout-javascript/news-feed-code.js @@ -101,6 +101,14 @@ DynamicList.prototype.toggleFilterElement = function (target, toggle) { } else { this.$container.find('.clear-filters').addClass('hidden'); } + + // Add number of filters applied + var filterHolder = $target.parents('.news-feed-filters-panel'); + var filterName = filterHolder.find('.panel-title-text').text().trim(); + var activeFilters = this.getActiveFilters()[filterName]; + var numberOfFiltersText = !!activeFilters ? '(' + activeFilters.length + ')' : ''; + + filterHolder.find('.filter-number').text(numberOfFiltersText); } DynamicList.prototype.clearFilters = function () { diff --git a/js/layout-javascript/simple-list-code.js b/js/layout-javascript/simple-list-code.js index 6d0992bf..c0bf4f60 100644 --- a/js/layout-javascript/simple-list-code.js +++ b/js/layout-javascript/simple-list-code.js @@ -95,6 +95,14 @@ DynamicList.prototype.toggleFilterElement = function (target, toggle) { } else { this.$container.find('.clear-filters').addClass('hidden'); } + + // Add number of filters applied + var filterHolder = $target.parents('.simple-list-filters-panel'); + var filterName = filterHolder.find('.panel-title-text').text().trim(); + var activeFilters = this.getActiveFilters()[filterName]; + var numberOfFiltersText = !!activeFilters ? '(' + activeFilters.length + ')' : ''; + + filterHolder.find('.filter-number').text(numberOfFiltersText); } DynamicList.prototype.clearFilters = function () { diff --git a/js/layout-javascript/small-card-code.js b/js/layout-javascript/small-card-code.js index 4863a392..de5404c0 100644 --- a/js/layout-javascript/small-card-code.js +++ b/js/layout-javascript/small-card-code.js @@ -100,6 +100,14 @@ DynamicList.prototype.toggleFilterElement = function (target, toggle) { } else { this.$container.find('.clear-filters').addClass('hidden'); } + + // Add number of filters applied + var filterHolder = $target.parents('.small-card-filters-panel'); + var filterName = filterHolder.find('.panel-title-text').text().trim(); + var activeFilters = this.getActiveFilters()[filterName]; + var numberOfFiltersText = !!activeFilters ? '(' + activeFilters.length + ')' : ''; + + filterHolder.find('.filter-number').text(numberOfFiltersText); } DynamicList.prototype.clearFilters = function () { diff --git a/templates/build/agenda-filters.build.hbs b/templates/build/agenda-filters.build.hbs index 5a9e8d01..81a0cb01 100644 --- a/templates/build/agenda-filters.build.hbs +++ b/templates/build/agenda-filters.build.hbs @@ -7,6 +7,7 @@ \{{[name]}} + diff --git a/templates/build/news-feed-filters.build.hbs b/templates/build/news-feed-filters.build.hbs index d51d235e..5e6569ad 100644 --- a/templates/build/news-feed-filters.build.hbs +++ b/templates/build/news-feed-filters.build.hbs @@ -7,6 +7,7 @@ \{{[name]}} + diff --git a/templates/build/simple-list-filters.build.hbs b/templates/build/simple-list-filters.build.hbs index 6dc243c2..3b6b73a1 100644 --- a/templates/build/simple-list-filters.build.hbs +++ b/templates/build/simple-list-filters.build.hbs @@ -7,6 +7,7 @@ \{{[name]}} + diff --git a/templates/build/small-card-filters.build.hbs b/templates/build/small-card-filters.build.hbs index f283b956..0324f3aa 100644 --- a/templates/build/small-card-filters.build.hbs +++ b/templates/build/small-card-filters.build.hbs @@ -7,6 +7,7 @@ \{{[name]}} +