Skip to content

Commit 6f02549

Browse files
committed
Fix issue where filtering is not resetting page number
1 parent 6d84eae commit 6f02549

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
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("3.6.29")]
19-
[assembly: AssemblyFileVersion("3.6.29")]
18+
[assembly: AssemblyVersion("3.6.30")]
19+
[assembly: AssemblyFileVersion("3.6.30")]
2020
//[assembly: AssemblyInformationalVersion("2.5-filters")]

Build/build.proj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<PackageDir>$(BuildDir)\Packages</PackageDir>
88
<SolutionFile>$(BaseDir)\Griddly.sln</SolutionFile>
99
<MSBuildExtensions>$(BaseDir)\.build\MSBuild.Community.Tasks.dll</MSBuildExtensions>
10-
<VisualStudioVersion>16.0</VisualStudioVersion>
10+
<VisualStudioVersion>17.0</VisualStudioVersion>
1111
</PropertyGroup>
1212

1313
<UsingTask AssemblyFile="$(MSBuildExtensions)" TaskName="MSBuild.Community.Tasks.XmlUpdate" />

Griddly.NetCore.Razor/wwwroot/js/griddly.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -664,7 +664,7 @@
664664
hidePopover(filter, self.isBootstrap4);
665665

666666
if (!self.options.autoRefreshOnFilter && self.pendingInlineFilterRefresh) {
667-
self.refresh();
667+
self.refresh(true);
668668
}
669669
}
670670
}
@@ -1247,7 +1247,7 @@
12471247
$input.blur();
12481248

12491249
if (!this.options.autoRefreshOnFilter && this.pendingInlineFilterRefresh) {
1250-
this.refresh();
1250+
this.refresh(true);
12511251
}
12521252

12531253
var filter = $input.data("griddly-filter");
@@ -1309,7 +1309,7 @@
13091309
else {
13101310
$(".griddly-inline-filter-update", content).click($.proxy(function (e) {
13111311
if (this.pendingInlineFilterRefresh) {
1312-
this.refresh();
1312+
this.refresh(true);
13131313
}
13141314
hidePopover(filterTrigger, this.isBootstrap4);
13151315
}, this));
@@ -1593,7 +1593,7 @@
15931593
this.triggerOrQueue(this.$element, "resetfilters.griddly");
15941594

15951595
if (refresh != false)
1596-
this.refresh();
1596+
this.refresh(true);
15971597
},
15981598

15991599
clearFilterValues: function (refresh)
@@ -1603,7 +1603,7 @@
16031603
this.triggerOrQueue(this.$element, "resetfilters.griddly");
16041604

16051605
if (refresh != false)
1606-
this.refresh();
1606+
this.refresh(true);
16071607
},
16081608

16091609
updateFilterDisplay: function ()

Griddly/Scripts/griddly.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -664,7 +664,7 @@
664664
hidePopover(filter, self.isBootstrap4);
665665

666666
if (!self.options.autoRefreshOnFilter && self.pendingInlineFilterRefresh) {
667-
self.refresh();
667+
self.refresh(true);
668668
}
669669
}
670670
}
@@ -1247,7 +1247,7 @@
12471247
$input.blur();
12481248

12491249
if (!this.options.autoRefreshOnFilter && this.pendingInlineFilterRefresh) {
1250-
this.refresh();
1250+
this.refresh(true);
12511251
}
12521252

12531253
var filter = $input.data("griddly-filter");
@@ -1309,7 +1309,7 @@
13091309
else {
13101310
$(".griddly-inline-filter-update", content).click($.proxy(function (e) {
13111311
if (this.pendingInlineFilterRefresh) {
1312-
this.refresh();
1312+
this.refresh(true);
13131313
}
13141314
hidePopover(filterTrigger, this.isBootstrap4);
13151315
}, this));
@@ -1593,7 +1593,7 @@
15931593
this.triggerOrQueue(this.$element, "resetfilters.griddly");
15941594

15951595
if (refresh != false)
1596-
this.refresh();
1596+
this.refresh(true);
15971597
},
15981598

15991599
clearFilterValues: function (refresh)
@@ -1603,7 +1603,7 @@
16031603
this.triggerOrQueue(this.$element, "resetfilters.griddly");
16041604

16051605
if (refresh != false)
1606-
this.refresh();
1606+
this.refresh(true);
16071607
},
16081608

16091609
updateFilterDisplay: function ()

0 commit comments

Comments
 (0)