Merge pull request #4711 from nickescallon/fix-filter-height

fix(core): correct filter detection in autoAdjustHeight

Author: swalters

src/js/core/directives/ui-grid.js

@@ -317,13 +317,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;
               }
             }