Skip to content

Commit ed4ed33

Browse files
committed
Fix more multi-grid issues w/ inline filters
1 parent b9a98e2 commit ed4ed33

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Build/CommonAssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
//
1616
// You can specify all the values or you can default the Revision and Build Numbers
1717
// by using the '*' as shown below:
18-
[assembly: AssemblyVersion("2.4.3")]
19-
[assembly: AssemblyFileVersion("2.4.3")]
18+
[assembly: AssemblyVersion("2.4.4")]
19+
[assembly: AssemblyFileVersion("2.4.4")]
2020
//[assembly: AssemblyInformationalVersion("2.0-alpha6")]

Griddly/Scripts/griddly.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@
236236
var sort = this.options.sortFields[i];
237237

238238
var header = $("th[data-griddly-sortfield='" + sort.Field + "']", this.$element);
239-
var inlineFilter = $(".griddly-filters-inline")[0].cells[header[0].cellIndex];
239+
var inlineFilter = $(".griddly-filters-inline", this.$element)[0].cells[header[0].cellIndex];
240240

241241
header.addClass(sort.Direction == "Ascending" ? "sorted_a" : "sorted_d");
242242
$(inlineFilter).addClass(sort.Direction == "Ascending" ? "sorted_a" : "sorted_d");
@@ -270,7 +270,7 @@
270270
{
271271
if (this.options.filterMode == "Inline" && $(event.target).parents('.popover.in').length == 0 && $(event.target).parents(".filter-trigger").length == 0 && !$(event.target).hasClass("filter-trigger"))
272272
{
273-
$(".griddly-filters-inline .filter-trigger").each(function ()
273+
$(".griddly-filters-inline .filter-trigger", this.$element).each(function ()
274274
{
275275
var filter = $(this);
276276

@@ -825,7 +825,7 @@
825825
$(el).popover({
826826
html: true,
827827
placement: "bottom",
828-
container: ".griddly-filters-inline",
828+
container: $(".griddly-filters-inline", this.$element),
829829
template: '<div class="popover griddly-filter-popover"><div class="arrow"></div><h3 class="popover-title"></h3><div class="popover-content"></div></div>',
830830
content: function ()
831831
{

0 commit comments

Comments
 (0)