Fix for date ranges

Author: mcintyre321

Mvc.JQuery.Datatables.Templates/Content/jquery.dataTables.columnFilter.js

@@ -814,10 +814,11 @@
                         var index = aiCustomSearch_Indexes[j];
 
                         for (k = 0; k < aoData.length; k++) {
-                            if (aoData[k].name == "sSearch_" + index)
+                            if (aoData[k].name == "sSearch_" + index) {
                                 aoData[k].value = afnSearch_[j]();
-                            //HM// Added this line to force the value in
-                            oTable.fnSettings().aoPreSearchCols[index].sSearch = aoData[k].value;
+                                //HM// Added this line to force the value in
+                                oTable.fnSettings().aoPreSearchCols[index].sSearch = aoData[k].value;
+                            }
                         }
                     }
                     aoData.push({ "name": "sRangeSeparator", "value": properties.sRangeSeparator });

Mvc.JQuery.Datatables/DataTableConfigVm.cs

@@ -6,6 +6,7 @@
 using Mvc.JQuery.Datatables.Models;
 using Mvc.JQuery.Datatables.Serialization;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace Mvc.JQuery.Datatables
 {
@@ -205,9 +206,10 @@ public _FilterOn<DataTableConfigVm> FilterOn(string columnName, IDictionary<stri
             }
             if (jsInitialSearchCols != null)
             {
+                colDef.SearchCols = new JObject();
                 foreach (var jsInitialSearchCol in jsInitialSearchCols)
                 {
-                    colDef.JsInitialSearchCols[jsInitialSearchCol.Key] = jsInitialSearchCol.Value;
+                    colDef.SearchCols[jsInitialSearchCol.Key] = new JValue(jsInitialSearchCol.Value);
                 }
             }
             return new _FilterOn<DataTableConfigVm>(this, colDef);
@@ -257,8 +259,8 @@ private static string ConvertColumnDefsToJson(IEnumerable<ColDef> columns)
         private static string ConvertColumnDefsInitialSearchToJson(IEnumerable<ColDef> columns)
         {
             var initialSearches = columns
-                .Select(c => c.Searchable & c.JsInitialSearchCols.Any() ? c.JsInitialSearchCols : null).ToArray();
-            return new JavaScriptSerializer().Serialize(initialSearches);
+                .Select(c => c.Searchable & c.SearchCols != null ? c.SearchCols.ToString() : null as object).ToArray();
+            return new JArray(initialSearches).ToString();
         }
 
         private static string ConvertColumnSortingToJson(IEnumerable<ColDef> columns)

Mvc.JQuery.Datatables/Models/ColDef.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Newtonsoft.Json.Linq;
 
 namespace Mvc.JQuery.Datatables.Models
 {
@@ -32,8 +33,7 @@ protected internal ColDef(string name, Type type)
         public string MRenderFunction { get; set; }
         public FilterDef Filter { get; set; }
 
-        IDictionary<string, object> m_JsInitialSearchCols = new Dictionary<string, object>();
-        public IDictionary<string, object> JsInitialSearchCols { get { return m_JsInitialSearchCols; } }
+        public JObject SearchCols { get; set; }
         public Attribute[] CustomAttributes { get; set; }
     }
 }