camel case sortfield javascript object

jehhynes · jehhynes · commit d2f8a3a79efa · 2020-04-20T14:06:56.000-04:00
diff --git a/Griddly.NetCore/Views/Shared/Griddly/Griddly.cshtml b/Griddly.NetCore/Views/Shared/Griddly/Griddly.cshtml
@@ -155,8 +155,8 @@
         @: data-griddly-defaultrowids="@Json.Serialize(settings.DefaultRowIds != null ? settings.DefaultRowIds.Select(x => x.ToLower()).ToArray() : new[] { "value" })"
         @: data-griddly-filter-defaults="@Newtonsoft.Json.JsonConvert.SerializeObject(defaultFilters, Newtonsoft.Json.Formatting.None, new Newtonsoft.Json.Converters.IsoDateTimeConverter() { DateTimeFormat = "d" })"
         @: data-griddly-currency-symbol="@Griddly.Mvc.GriddlyExtensions.CurrencySymbol"
-        @: @Html.AttributeIf("data-griddly-currentsort", Model.SortFields != null && Model.SortFields.Any(), (z) => Html.Encode(Json.Serialize(Model.SortFields.Select(x => new { Field = x.Field, Direction = x.Direction.ToString() }))))
-        @: @Html.AttributeIf("data-griddly-defaultsort", defaultSort != null && defaultSort.Any(), (z) => Html.Encode(Json.Serialize(defaultSort.Select(x => new { Field = x.Field, Direction = x.Direction.ToString() }))))
+        @: @Html.AttributeIf("data-griddly-currentsort", Model.SortFields != null && Model.SortFields.Any(), (z) => Html.Encode(Json.Serialize(Model.SortFields.Select(x => new { field = x.Field, direction = x.Direction.ToString() }))))
+        @: @Html.AttributeIf("data-griddly-defaultsort", defaultSort != null && defaultSort.Any(), (z) => Html.Encode(Json.Serialize(defaultSort.Select(x => new { field = x.Field, direction = x.Direction.ToString() }))))
         @: @settings.HtmlAttributes.ToHtmlAttributes()>
     if (settings.BeforeTemplate != null)
     {
diff --git a/Griddly.NetCore/wwwroot/js/griddly.js b/Griddly.NetCore/wwwroot/js/griddly.js
@@ -890,15 +890,15 @@
 
                     for (var i = 0; i < this.options.sortFields.length; i++)
                     {
-                        if (this.options.sortFields[i].Field == sortField)
+                        if (this.options.sortFields[i].field == sortField)
                         {
                             currentPos = i;
 
                             break;
                         }
                     }
 
-                    var currentDirection = currentPos != -1 ? this.options.sortFields[currentPos].Direction : "Descending";
+                    var currentDirection = currentPos != -1 ? this.options.sortFields[currentPos].direction : "Descending";
                     var newDirection = currentDirection == "Descending" ? "Ascending" : "Descending";
 
                     var inlineFilters = $("tr.griddly-filters-inline", this.$element);
@@ -907,7 +907,7 @@
                     {
                         for (var i = 0; i < this.options.sortFields.length; i++)
                         {
-                            var thisSortField = this.options.sortFields[i].Field;
+                            var thisSortField = this.options.sortFields[i].field;
 
                             if (thisSortField != sortField)
                             {
@@ -924,9 +924,9 @@
                     }
 
                     if (currentPos != -1 && this.options.sortFields.length)
-                        this.options.sortFields[currentPos].Direction = newDirection;
+                        this.options.sortFields[currentPos].direction = newDirection;
                     else
-                        this.options.sortFields.push({ Field: sortField, Direction: newDirection });
+                        this.options.sortFields.push({ field: sortField, direction: newDirection });
 
 
                     var newSortDisplay = [event.currentTarget];
@@ -1595,15 +1595,15 @@
                 {
                     var sort = this.options.sortFields[i];
 
-                    var header = $("th[data-griddly-sortfield='" + sort.Field + "']", this.$element);
+                    var header = $("th[data-griddly-sortfield='" + sort.field + "']", this.$element);
 
-                    header.addClass(sort.Direction == "Ascending" ? "sorted_a" : "sorted_d");
+                    header.addClass(sort.direction == "Ascending" ? "sorted_a" : "sorted_d");
 
                     if (inlineFilters.length)
                     {
                         var inlineFilter = inlineFilters[0].cells[header[0].cellIndex];
 
-                        $(inlineFilter).addClass(sort.Direction == "Ascending" ? "sorted_a" : "sorted_d");
+                        $(inlineFilter).addClass(sort.direction == "Ascending" ? "sorted_a" : "sorted_d");
                     }
                 }
             }
@@ -1629,7 +1629,7 @@
                 {
                     var field = this.options.sortFields[i];
 
-                    postData["sortFields[" + i + "][" + field.Field + "]"] = field.Direction;
+                    postData["sortFields[" + i + "][" + field.field + "]"] = field.direction;
                 }
             }
 
diff --git a/Griddly/Scripts/griddly.js b/Griddly/Scripts/griddly.js
@@ -890,15 +890,15 @@
 
                     for (var i = 0; i < this.options.sortFields.length; i++)
                     {
-                        if (this.options.sortFields[i].Field == sortField)
+                        if (this.options.sortFields[i].field == sortField)
                         {
                             currentPos = i;
 
                             break;
                         }
                     }
 
-                    var currentDirection = currentPos != -1 ? this.options.sortFields[currentPos].Direction : "Descending";
+                    var currentDirection = currentPos != -1 ? this.options.sortFields[currentPos].direction : "Descending";
                     var newDirection = currentDirection == "Descending" ? "Ascending" : "Descending";
 
                     var inlineFilters = $("tr.griddly-filters-inline", this.$element);
@@ -907,7 +907,7 @@
                     {
                         for (var i = 0; i < this.options.sortFields.length; i++)
                         {
-                            var thisSortField = this.options.sortFields[i].Field;
+                            var thisSortField = this.options.sortFields[i].field;
 
                             if (thisSortField != sortField)
                             {
@@ -924,9 +924,9 @@
                     }
 
                     if (currentPos != -1 && this.options.sortFields.length)
-                        this.options.sortFields[currentPos].Direction = newDirection;
+                        this.options.sortFields[currentPos].direction = newDirection;
                     else
-                        this.options.sortFields.push({ Field: sortField, Direction: newDirection });
+                        this.options.sortFields.push({ field: sortField, direction: newDirection });
 
 
                     var newSortDisplay = [event.currentTarget];
@@ -1595,15 +1595,15 @@
                 {
                     var sort = this.options.sortFields[i];
 
-                    var header = $("th[data-griddly-sortfield='" + sort.Field + "']", this.$element);
+                    var header = $("th[data-griddly-sortfield='" + sort.field + "']", this.$element);
 
-                    header.addClass(sort.Direction == "Ascending" ? "sorted_a" : "sorted_d");
+                    header.addClass(sort.direction == "Ascending" ? "sorted_a" : "sorted_d");
 
                     if (inlineFilters.length)
                     {
                         var inlineFilter = inlineFilters[0].cells[header[0].cellIndex];
 
-                        $(inlineFilter).addClass(sort.Direction == "Ascending" ? "sorted_a" : "sorted_d");
+                        $(inlineFilter).addClass(sort.direction == "Ascending" ? "sorted_a" : "sorted_d");
                     }
                 }
             }
@@ -1629,7 +1629,7 @@
                 {
                     var field = this.options.sortFields[i];
 
-                    postData["sortFields[" + i + "][" + field.Field + "]"] = field.Direction;
+                    postData["sortFields[" + i + "][" + field.field + "]"] = field.direction;
                 }
             }
 
diff --git a/Griddly/Views/Shared/Griddly/Griddly.cshtml b/Griddly/Views/Shared/Griddly/Griddly.cshtml
@@ -172,8 +172,8 @@
         @: data-griddly-defaultrowids="@Json.Encode(settings.DefaultRowIds != null ? settings.DefaultRowIds.Select(x => x.ToLower()).ToArray() : new[] { "value" })"
         @: data-griddly-filter-defaults="@Newtonsoft.Json.JsonConvert.SerializeObject(defaultFilters, Newtonsoft.Json.Formatting.None, new Newtonsoft.Json.Converters.IsoDateTimeConverter() { DateTimeFormat = "d" })"
         @: data-griddly-currency-symbol="@Griddly.Mvc.GriddlyExtensions.CurrencySymbol"
-        @: @Html.AttributeIf("data-griddly-currentsort", Model.SortFields != null && Model.SortFields.Any(), (z) => Html.AttributeEncode(Json.Encode(Model.SortFields.Select(x => new { Field = x.Field, Direction = x.Direction.ToString() }))))
-        @: @Html.AttributeIf("data-griddly-defaultsort", defaultSort != null && defaultSort.Any(), (z) => Html.AttributeEncode(Json.Encode(defaultSort.Select(x => new { Field = x.Field, Direction = x.Direction.ToString() }))))
+        @: @Html.AttributeIf("data-griddly-currentsort", Model.SortFields != null && Model.SortFields.Any(), (z) => Html.AttributeEncode(Json.Encode(Model.SortFields.Select(x => new { field = x.Field, direction = x.Direction.ToString() }))))
+        @: @Html.AttributeIf("data-griddly-defaultsort", defaultSort != null && defaultSort.Any(), (z) => Html.AttributeEncode(Json.Encode(defaultSort.Select(x => new { field = x.Field, direction = x.Direction.ToString() }))))
         @: @settings.HtmlAttributes.ToHtmlAttributes()>
     if (settings.BeforeTemplate != null)
     {

Original file line number	Diff line number	Diff line change
`@@ -890,15 +890,15 @@`
`890`	`890`
`891`	`891`	`for (var i = 0; i < this.options.sortFields.length; i++)`
`892`	`892`	`{`
`893`		`- if (this.options.sortFields[i].Field == sortField)`
	`893`	`+ if (this.options.sortFields[i].field == sortField)`
`894`	`894`	`{`
`895`	`895`	`currentPos = i;`
`896`	`896`
`897`	`897`	`break;`
`898`	`898`	`}`
`899`	`899`	`}`
`900`	`900`
`901`		`- var currentDirection = currentPos != -1 ? this.options.sortFields[currentPos].Direction : "Descending";`
	`901`	`+ var currentDirection = currentPos != -1 ? this.options.sortFields[currentPos].direction : "Descending";`
`902`	`902`	`var newDirection = currentDirection == "Descending" ? "Ascending" : "Descending";`
`903`	`903`
`904`	`904`	`var inlineFilters = $("tr.griddly-filters-inline", this.$element);`
`@@ -907,7 +907,7 @@`
`907`	`907`	`{`
`908`	`908`	`for (var i = 0; i < this.options.sortFields.length; i++)`
`909`	`909`	`{`
`910`		`- var thisSortField = this.options.sortFields[i].Field;`
	`910`	`+ var thisSortField = this.options.sortFields[i].field;`
`911`	`911`
`912`	`912`	`if (thisSortField != sortField)`
`913`	`913`	`{`
`@@ -924,9 +924,9 @@`
`924`	`924`	`}`
`925`	`925`
`926`	`926`	`if (currentPos != -1 && this.options.sortFields.length)`
`927`		`- this.options.sortFields[currentPos].Direction = newDirection;`
	`927`	`+ this.options.sortFields[currentPos].direction = newDirection;`
`928`	`928`	`else`
`929`		`- this.options.sortFields.push({ Field: sortField, Direction: newDirection });`
	`929`	`+ this.options.sortFields.push({ field: sortField, direction: newDirection });`
`930`	`930`
`931`	`931`
`932`	`932`	`var newSortDisplay = [event.currentTarget];`
`@@ -1595,15 +1595,15 @@`
`1595`	`1595`	`{`
`1596`	`1596`	`var sort = this.options.sortFields[i];`
`1597`	`1597`
`1598`		`- var header = $("th[data-griddly-sortfield='" + sort.Field + "']", this.$element);`
	`1598`	`+ var header = $("th[data-griddly-sortfield='" + sort.field + "']", this.$element);`
`1599`	`1599`
`1600`		`- header.addClass(sort.Direction == "Ascending" ? "sorted_a" : "sorted_d");`
	`1600`	`+ header.addClass(sort.direction == "Ascending" ? "sorted_a" : "sorted_d");`
`1601`	`1601`
`1602`	`1602`	`if (inlineFilters.length)`
`1603`	`1603`	`{`
`1604`	`1604`	`var inlineFilter = inlineFilters[0].cells[header[0].cellIndex];`
`1605`	`1605`
`1606`		`- $(inlineFilter).addClass(sort.Direction == "Ascending" ? "sorted_a" : "sorted_d");`
	`1606`	`+ $(inlineFilter).addClass(sort.direction == "Ascending" ? "sorted_a" : "sorted_d");`
`1607`	`1607`	`}`
`1608`	`1608`	`}`
`1609`	`1609`	`}`
`@@ -1629,7 +1629,7 @@`
`1629`	`1629`	`{`
`1630`	`1630`	`var field = this.options.sortFields[i];`
`1631`	`1631`
`1632`		`- postData["sortFields[" + i + "][" + field.Field + "]"] = field.Direction;`
	`1632`	`+ postData["sortFields[" + i + "][" + field.field + "]"] = field.direction;`
`1633`	`1633`	`}`
`1634`	`1634`	`}`
`1635`	`1635`