fix(core): correct filter detection in autoAdjustHeight

angular-ui · Nov 30, 2015 · 31c8e9e · 31c8e9e
1 parent f715767
commit 31c8e9e
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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;
               }
             }