Skip to content

Commit c5d6cf0

Browse files
committed
Allow GriddlyHtmlFilter to work in inline filter mode
1 parent a25b493 commit c5d6cf0

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

Griddly/Scripts/griddly.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -570,7 +570,7 @@
570570
return str;
571571
}
572572

573-
this.$inlineFilters = $(".griddly-filters-inline .filter-content input", this.$element);
573+
this.$inlineFilters = $(".griddly-filters-inline .filter-content input, .griddly-filters-inline .griddly-filter.griddly-html-filter input", this.$element);
574574

575575
$(".griddly-filters-inline .filter-content input", this.$element).on("change", $.proxy(function (event, dontHide)
576576
{

Griddly/Views/Shared/Griddly/GriddlyFilterInline.cshtml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@
2222
GriddlyFilterBox filterBox = filter as GriddlyFilterBox;
2323
GriddlyFilterRange filterRange = filter as GriddlyFilterRange;
2424
GriddlyFilterList filterList = filter as GriddlyFilterList;
25+
GriddlyHtmlFilter filterHtml = filter as GriddlyHtmlFilter;
2526

26-
<div class="btn-group griddly-filter @(filterBox != null ? "griddly-filter-box" : null) @(filterRange != null ? "griddly-filter-range" : null) @(filterList != null ? "griddly-filter-list" : null)"
27+
<div class="btn-group griddly-filter @(filterBox != null ? "griddly-filter-box" : null) @(filterRange != null ? "griddly-filter-range" : null) @(filterList != null ? "griddly-filter-list" : null) @(filterHtml != null ? "griddly-html-filter" : null)"
2728
data-filter-name="@filter.Caption" data-filter-name-plural="@filter.CaptionPlural"
2829
data-filter-datatype="@filter.DataType.ToString()"
2930
@Html.AttributeIf("data-griddly-filter-ismultiple", filterList != null, x => filterList.IsMultiple.ToString().ToLower())
@@ -33,6 +34,12 @@
3334
object defaultValue = this.GetGriddlyDefault(filter.Field);
3435
object defaultValueEnd = filterRange != null ? this.GetGriddlyDefault(filterRange.FieldEnd) : null;
3536
}
37+
@if (filterHtml != null)
38+
{
39+
@filterHtml.HtmlTemplate(filterHtml)
40+
}
41+
else
42+
{
3643
<a class="btn btn-link btn-xs filter-trigger">
3744
<span class="griddly-filter-display">
3845
@if (filterBox != null)
@@ -198,6 +205,7 @@
198205
</ul>
199206
}
200207
</div>
208+
}
201209
</div>
202210
}
203211
</td>

0 commit comments

Comments
 (0)