Skip to content

Commit 2b54563

Browse files
committed
fix #269
1 parent 156b290 commit 2b54563

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

client/src/main/webapp/WEB-INF/facets.vm

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
<div id="facets" class="infobox">
2-
<div class="right">
3-
<div class="small" onclick="K5.gui.facets.hide();" >#parse("svg/close.svg")</div>
4-
</div>
2+
53
#*
64
<div class="icon-filter"></div>
75
<div class="icon icon-pin" onclick="togglePin()"></div>
86
</div>
97
*#
8+
#if($search.usedFilters.entrySet().size() > 0)
9+
<div class="right">
10+
<div class="small" onclick="K5.gui.facets.removeAllFilters();" >#parse("svg/close.svg")</div>
11+
</div>
1012
<h2>#translatable("facets.used")</h2>
13+
1114
#foreach($filter in $search.usedFilters.entrySet())
1215
<div class="used">
1316
<a href="" data-key="$esc.html($filter.value)" data-facet="$filter.key" class="res" >
@@ -21,6 +24,7 @@
2124
</a>
2225
</div>
2326
#end
27+
#end
2428
<hr />
2529
<div class="unused"></div>
2630
</div>

client/src/main/webapp/WEB-INF/search_form.vm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<input type="hidden" name="start" id="start" value="$!{params.start}" />
66
<input type="hidden" name="rows" id="rows" value="$!{params.rows}" />
77
#foreach($filter in $search.usedFilters.entrySet())
8-
<input type="hidden" name="$filter.key" value="$esc.html($filter.value)" />
8+
<input class="facet" type="hidden" name="$filter.key" value="$esc.html($filter.value)" />
99
#end
1010

1111

client/src/main/webapp/js/facets.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Facets.prototype = {
3131
},
3232
addFilter: function(facet, val) {
3333
//window.location.href = window.location.search + "&" + facet + "=" + val;
34-
var input = $("<input>", {type: "hidden", value: val, name: facet});
34+
var input = $("<input>", {type: "hidden", value: val, name: facet, class: "facet"});
3535
$("#search_form").append(input);
3636
$("#start").val("0");
3737
$("#search_form").submit();
@@ -40,6 +40,10 @@ Facets.prototype = {
4040
$("input[name='" + facet + "']").remove();
4141
$("#search_form").submit();
4242
},
43+
removeAllFilters: function() {
44+
$("#search_form input.facet").remove();
45+
$("#search_form").submit();
46+
},
4347
hide: function() {
4448
var l = -55 - $("#facets").width();
4549
$("#facets").animate({'opacity': '0.5', 'right': l}, 200, function() {

0 commit comments

Comments
 (0)