Merge branch 'master' of https://github.com/programcsharp/griddly

Conflicts:
	Griddly/Scripts/griddly.js
	Griddly/Views/Shared/Griddly/Griddly.cshtml

Author: programcsharp

Build/CommonAssemblyInfo.cs

@@ -15,5 +15,5 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("1.0.77.3")]
-[assembly: AssemblyFileVersion("1.0.77.3")]
+[assembly: AssemblyVersion("1.0.79.0")]
+[assembly: AssemblyFileVersion("1.0.79.0")]

Griddly.Mvc/GriddlyResult.cs

@@ -241,7 +241,7 @@ public virtual long GetCount()
             return _result.Count();
         }
 
-        static IQueryable<T> ApplySortFields(IQueryable<T> source, SortField[] sortFields)
+        protected static IQueryable<T> ApplySortFields(IQueryable<T> source, SortField[] sortFields)
         {
             IOrderedQueryable<T> sortedQuery = null;
 

Griddly.Mvc/GriddlySettingsResult.cs

@@ -61,10 +61,6 @@ public static GriddlySettings GetSettings(ControllerContext context, string view
             {
                 throw;
             }
-            catch
-            {
-                return null;
-            }
         }
 
         class EmptyHttpContext : HttpContextBase

Griddly/Scripts/griddly.js

@@ -183,10 +183,7 @@
 
             $("form .grid_searchreset", this.$element).on("click", $.proxy(function (event)
             {
-                this.$element.find("form .transient").remove();
-                this.$element.find("form")[0].reset();
-
-                this.refresh(true);
+                this.resetFilterValues();
             }, this));
 
             $("a.btn-search", this.$element).on("click", $.proxy(function (event)
@@ -742,6 +739,18 @@
             this.refresh(true);
         },
 
+        resetFilterValues: function ()
+        {
+            // TODO: get defaults?
+
+            this.$element.find("form .transient").remove();
+            this.$element.find("form")[0].reset();
+
+            this.$element.trigger("resetfilters.griddly", this.$element);
+
+            this.refresh(true);
+        },
+
         buildRequest: function(paging)
         {
             var postData = this.getFilterValues();