Added column filter as a submodule

Merge branch 'master' of https://github.com/mcintyre321/mvc.jquery.datatables

Author: mcintyre321

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "Mvc.JQuery.Datatables.Templates/Content/jquery-datatables-column-filter"]
+	path = Mvc.JQuery.Datatables.Templates/Content/jquery-datatables-column-filter
+	url = https://github.com/mcintyre321/jquery-datatables-column-filter.git

Mvc.JQuery.Datatables.Example/Views/Home/_ExampleTable.cshtml

@@ -10,7 +10,7 @@
 <script type="text/javascript" src="//cdn.datatables.net/tabletools/2.2.1/js/dataTables.tableTools.min.js"></script>
 <link rel="stylesheet" href="//cdn.datatables.net/tabletools/2.2.1/css/dataTables.tableTools.css" />
 
-<script type="text/javascript" src="/Content/jquery.dataTables.columnFilter.js"></script>
+<script type="text/javascript" src="/Content/jquery-datatables-column-filter/media/js/jquery.dataTables.columnFilter.js"></script>
 
 <link rel="stylesheet" href="//cdn.datatables.net/colvis/1.1.1/css/dataTables.colVis.css" />
 <script type="text/javascript" src="//cdn.datatables.net/colvis/1.1.1/js/dataTables.colVis.min.js"></script>
@@ -25,7 +25,7 @@
     }"));
     vm.ColumnFilter = true;
     vm
-        .FilterOn("Position", new { sSelector = "#custom-filter-placeholder-position" }).Select("Engineer", "Tester", "Manager")
+        .FilterOn("Position", new { sSelector = "#custom-filter-placeholder-position" }, new { sSearch = "Tester" }).Select("Engineer", "Tester", "Manager")
         .FilterOn("Id").NumberRange()
         .FilterOn("Salary", new { sSelector = "#custom-filter-placeholder-salary" }).NumberRange();
     //.FilterOn("Number").CheckBoxes(Enum.GetNames(typeof(Numbers)));

Mvc.JQuery.Datatables.Templates/Content/jquery-datatables-column-filter

@@ -85,7 +85,7 @@
     <None Include="Views\Web.config" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Content\jquery.dataTables.columnFilter.js" />
+    <Content Include="Content\jquery-datatables-column-filter\media\js\jquery.dataTables.columnFilter.js" />
     <Content Include="Views\Shared\DataTable.cshtml" />
   </ItemGroup>
   <ItemGroup>

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

@@ -66,7 +66,7 @@
             }
             options["fnServerData"] = new JRaw(" function(sSource, aoData, fnCallback) { $.ajax({ 'dataType': 'json', 'type': 'POST', 'url': sSource, 'data': aoData, 'success': fnCallback })}");
             options["aoColumnDefs"] = new JRaw(Model.ColumnDefsString);
-            options["aoSearchCols"] = new JRaw(Model.ColumnInitialSearchString);
+            options["aoSearchCols"] = Model.SearchCols;
             if (Model.JsOptions.Any())
             {
                 foreach (var jsOption in Model.JsOptions)

Mvc.JQuery.Datatables.Templates/Mvc.JQuery.Datatables.Templates.csproj

@@ -61,11 +61,13 @@ public string ColumnDefsString
 
         public bool AutoWidth { get; set; }
 
-        public string ColumnInitialSearchString
+        public JToken SearchCols
         {
             get
             {
-                return ConvertColumnDefsInitialSearchToJson(Columns);
+                var initialSearches = Columns
+                    .Select(c => c.Searchable & c.SearchCols != null ? c.SearchCols : null as object).ToArray();
+                return new JArray(initialSearches);
             }
         }
 
@@ -256,13 +258,6 @@ private static string ConvertColumnDefsToJson(IEnumerable<ColDef> columns)
             return "[]";
         }
 
-        private static string ConvertColumnDefsInitialSearchToJson(IEnumerable<ColDef> columns)
-        {
-            var initialSearches = columns
-                .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)
         {
             var sortList = columns.Select((c, idx) => c.SortDirection == SortDirection.None ? new dynamic[] { -1, "" } : (c.SortDirection == SortDirection.Ascending ? new dynamic[] { idx, "asc" } : new dynamic[] { idx, "desc" })).Where(x => x[0] > -1).ToArray();

Mvc.JQuery.Datatables.Templates/Views/Shared/DataTable.cshtml

@@ -121,18 +121,16 @@
     <EmbeddedResource Include="..\Mvc.JQuery.Datatables.Templates\Views\Shared\DataTable.cshtml">
       <Link>Views\Shared\DataTable.cshtml</Link>
     </EmbeddedResource>
+    <EmbeddedResource Include="..\Mvc.JQuery.Datatables.Templates\Content\jquery-datatables-column-filter\media\js\jquery.dataTables.columnFilter.js">
+      <Link>Content\jquery-datatables-column-filter\media\js\jquery.dataTables.columnFilter.js</Link>
+    </EmbeddedResource>
     <Content Include="RegisterDatatablesModelBinder.cs.pp" />
     <None Include="packages.config" />
     <None Include="Views\Web.config" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Scripts\" />
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="..\Mvc.JQuery.Datatables.Templates\Content\jquery.dataTables.columnFilter.js">
-      <Link>Content\jquery.dataTables.columnFilter.js</Link>
-    </EmbeddedResource>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.