Merge remote-tracking branch 'upstream/master'

Author: mcshaz

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

@@ -33,7 +33,7 @@
 
 <script type="text/javascript">
     (function setDataTable() {
-        if(!window.jQuery) {
+        if(!window.jQuery || !$.fn.DataTable) {
             setTimeout(setDataTable, 100);
             return;
         }

Mvc.JQuery.Datatables/RegisterDatatablesModelBinder.cs.pp

@@ -3,7 +3,7 @@
 using System.Web.WebPages;
 using Mvc.JQuery.Datatables;
 
-[assembly: PreApplicationStartMethod(typeof(RegisterDatatablesModelBinder), "Start")]
+[assembly: PreApplicationStartMethod(typeof($rootnamespace$.RegisterDatatablesModelBinder), "Start")]
 
 namespace $rootnamespace$ {
     public static class RegisterDatatablesModelBinder {

Mvc.JQuery.Datatables/StringTransformers.cs

@@ -5,41 +5,43 @@
 
 namespace Mvc.JQuery.Datatables
 {
-    static class StringTransformers
+    public static class StringTransformers
     {
         internal static object GetStringedValue(Type propertyType, object value)
         {
-            foreach (var transformer in Transformers)
-            {
-                var result = transformer(propertyType, value);
-                if (result != null) return result;
-            }
+            if (Transformers.ContainsKey(propertyType))
+                return Transformers[propertyType](propertyType, value);
             return (value as object ?? "").ToString();
         }
-        private static readonly List<StringTransformer> Transformers = new List<StringTransformer>()
+
+        static StringTransformers()
         {
-            Guard<DateTimeOffset>(dateTimeOffset => dateTimeOffset.ToLocalTime().ToString("g")),
-            Guard<DateTime>(dateTime => dateTime.ToLocalTime().ToString("g")),
-            Guard<IHtmlString>(s => s.ToHtmlString()),
-            Guard<IEnumerable<string>>(s => s.ToArray()),
-            Guard<IEnumerable<int>>(s => s.ToArray()),
-            Guard<IEnumerable<long>>(s => s.ToArray()),
-            Guard<IEnumerable<decimal>>(s => s.ToArray()),
-            Guard<IEnumerable<bool>>(s => s.ToArray()),
-            Guard<IEnumerable<double>>(s => s.ToArray()),
-            Guard<IEnumerable<object>>(s => s.Select(o => GetStringedValue(o.GetType(), o)).ToArray()),
-            Guard<bool>(s => s),
-            Guard<object>(o => (o ?? "").ToString())
-        };
+            RegisterFilter<DateTimeOffset>(dateTimeOffset => dateTimeOffset.ToLocalTime().ToString("g"));
+            RegisterFilter<DateTime>(dateTime => dateTime.ToString("g"));
+            RegisterFilter<IHtmlString>(s => s.ToHtmlString());
+            RegisterFilter<IEnumerable<string>>(s => s.ToArray());
+            RegisterFilter<IEnumerable<int>>(s => s.ToArray());
+            RegisterFilter<IEnumerable<long>>(s => s.ToArray());
+            RegisterFilter<IEnumerable<decimal>>(s => s.ToArray());
+            RegisterFilter<IEnumerable<bool>>(s => s.ToArray());
+            RegisterFilter<IEnumerable<double>>(s => s.ToArray());
+            RegisterFilter<IEnumerable<object>>(s => s.Select(o => GetStringedValue(o.GetType(), o)).ToArray());
+            RegisterFilter<bool>(s => s);
+            RegisterFilter<object>(o => (o ?? "").ToString());
+        }
 
-        public delegate object GuardedValueTransformer<TVal>(TVal value);
+        private static readonly Dictionary<Type, StringTransformer> Transformers = new Dictionary<Type, StringTransformer>();
 
+        public delegate object GuardedValueTransformer<TVal>(TVal value);
 
         public delegate object StringTransformer(Type type, object value);
 
         public static void RegisterFilter<TVal>(GuardedValueTransformer<TVal> filter)
         {
-            Transformers.Add(Guard<TVal>(filter));
+            if (Transformers.ContainsKey(typeof(TVal)))
+                Transformers[typeof(TVal)] = Guard(filter);
+            else
+                Transformers.Add(typeof(TVal), Guard(filter));
         }
 
         private static StringTransformer Guard<TVal>(GuardedValueTransformer<TVal> transformer)
@@ -64,4 +66,4 @@ public static Dictionary<string, object> TransformDictionary(Dictionary<string,
             return output;
         }
     }
-}
+}

README.md

@@ -1,18 +1,38 @@
-ASP MVC Helpers for working with the amazing Jquery DataTables plugin. See http://mvcjquerydatatables.apphb.com/ for an example
+turn IQueryables into datagrids
+----------------------------------
 
-http://nuget.org/packages/Mvc.JQuery.Datatables
-
-The code here is based on code from http://code.google.com/p/datatables-asp-mvc/
+> Install-Package Mvc.JQuery.Datatables
 
-If you have a feature request, bug, or a patch, please could you add an example page on a fork demonstrating the problem or feature. Thanks!
+> Install-Package Mvc.JQuery.Datatables.Templates *
 
-[![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=mcintyre321&url=https://github.com/mcintyre321/mvc.jquery.datatables&title=Mvc.JQuery.DataTables&language=&tags=github&category=software)
 
-Example output:
+[Demo site](http://mvcjquerydatatables.apphb.com/)
+![Example](http://snag.gy/FQFdn.jpg)
 
+ - turn any IQueryable into a live datagrid. Tested with:
+   - Linq To Objects
+   - Entity Framework
+   - Lucene.Net.Linq
+ - wraps the very comprehensive jquery datatables plugin. Supported features: 
+   - Filtering (text, date range (with datepicker), number ranges, choose from dropdown, multiple values using checkboxes)
+   - Sorting (configurable per column)
+   - Paging (choose page size options, or fix them)
+   - Customer column rendering 
+   - Custom positioning of filters (e.g. you could move them above the table)
+   - Localization
+   - TableTools support (PDF/Excel export)
+   - Attribute based configuration (optional)
+ - Can be run from dll 
+ 
+*skip this if using EmbeddedResourceVirtualPathProvider
+
+
+See the test page and example project for info on how to use
 
-![Example](http://snag.gy/FQFdn.jpg)
+http://nuget.org/packages/Mvc.JQuery.Datatables
 
+The code here is based on code from http://code.google.com/p/datatables-asp-mvc/
 
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/mcintyre321/mvc.jquery.datatables/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+If you have a feature request, bug, or a patch, please could you add an example page on a fork demonstrating the problem or feature. Thanks!
 
+[![Flattr this git repo](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=mcintyre321&url=https://github.com/mcintyre321/mvc.jquery.datatables&title=Mvc.JQuery.DataTables&language=&tags=github&category=software)