Skip to content

Commit 26aeca1

Browse files
committed
Fixed event triggers to pass proper data
Fixed bug on requests with a null form key
1 parent 05cf7cc commit 26aeca1

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

Build/CommonAssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
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("1.0.82.0")]
19-
[assembly: AssemblyFileVersion("1.0.82.0")]
18+
[assembly: AssemblyVersion("1.0.82.1")]
19+
[assembly: AssemblyFileVersion("1.0.82.1")]

Griddly.Mvc/GriddlyResult.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public abstract class GriddlyResult : ActionResult
1616
public SortField[] GetSortFields(NameValueCollection items)
1717
{
1818
return items.AllKeys
19-
.Where(x => x.StartsWith("sortFields["))
19+
.Where(x => x != null && x.StartsWith("sortFields["))
2020
.Select(x =>
2121
{
2222
int pos = x.IndexOf(']', "sortFields[".Length);

Griddly/Scripts/griddly.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
if (this.options.onRefresh)
2424
this.options.onRefresh(this, 0, this.options.count > this.options.pageSize ? this.options.pageSize : this.options.count, this.options.count, null);
2525

26-
this.$element.trigger("init.griddly", this.$element,
26+
this.$element.trigger("init.griddly",
2727
{
2828
start: 0,
2929
pageSize: this.options.count > this.options.pageSize ? this.options.pageSize : this.options.count,
@@ -795,7 +795,7 @@
795795

796796
this.setFilterValues(this.options.filterDefaults);
797797

798-
this.$element.trigger("resetfilters.griddly", this.$element);
798+
this.$element.trigger("resetfilters.griddly");
799799

800800
this.refresh(true);
801801
},
@@ -828,7 +828,7 @@
828828

829829
refresh: function(resetPage)
830830
{
831-
this.$element.trigger("beforerefresh.griddly", this.$element);
831+
this.$element.trigger("beforerefresh.griddly");
832832

833833
if (!this.options.url)
834834
{
@@ -898,7 +898,7 @@
898898
$(e).prop("checked", true);
899899
});
900900

901-
this.$element.trigger("refresh.griddly", this.$element,
901+
this.$element.trigger("refresh.griddly",
902902
{
903903
start: startRecord,
904904
pageSize: currentPageSize,
@@ -920,7 +920,7 @@
920920
window.location = url;
921921
}
922922

923-
this.$element.trigger("error.griddly", this.$element);
923+
this.$element.trigger("error.griddly", { xhr: xhr, status: status, error: errorThrown });
924924
}, this));
925925
},
926926

0 commit comments

Comments
 (0)