From 31c8e9e8375236938c8244d87ac7f5d10bd4efe0 Mon Sep 17 00:00:00 2001
From: Nick Escallon <nickescallon@gmail.com>
Date: Mon, 16 Nov 2015 15:43:50 -0500
Subject: [PATCH] fix(core): correct filter detection in autoAdjustHeight

---
 src/js/core/directives/ui-grid.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/js/core/directives/ui-grid.js b/src/js/core/directives/ui-grid.js
index 4e91f234b7..f29fcfcfb7 100644
--- a/src/js/core/directives/ui-grid.js
+++ b/src/js/core/directives/ui-grid.js
@@ -312,13 +312,13 @@ function uiGridDirective($compile, $templateCache, $timeout, $window, gridUtil,
               }
             });
 
-            if (grid.options.enableFiltering) {
-              var allColumnsHaveFilteringTurnedOff = grid.options.columnDefs.every(function(col) {
+            if (grid.options.enableFiltering  && !maxNumberOfFilters) {
+              var allColumnsHaveFilteringTurnedOff = grid.options.columnDefs.length && grid.options.columnDefs.every(function(col) {
                 return col.enableFiltering === false;
               });
 
               if (!allColumnsHaveFilteringTurnedOff) {
-                maxNumberOfFilters++;
+                maxNumberOfFilters = 1;
               }
             }