From 124492e10c4113835b50da5c9d39743a0e63d464 Mon Sep 17 00:00:00 2001 From: andergu Date: Fri, 7 Nov 2014 11:40:46 +0100 Subject: [PATCH] include filter height when calculating grid height --- src/js/core/directives/ui-grid.js | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/src/js/core/directives/ui-grid.js b/src/js/core/directives/ui-grid.js index ad75e02cd0..a408cf86b7 100644 --- a/src/js/core/directives/ui-grid.js +++ b/src/js/core/directives/ui-grid.js @@ -210,7 +210,23 @@ angular.module('ui.grid').directive('uiGrid', var footerHeight = grid.options.showFooter ? grid.options.footerRowHeight : 0; var scrollbarHeight = grid.options.enableScrollbars ? gridUtil.getScrollbarWidth() : 0; - var newHeight = headerHeight + contentHeight + footerHeight + scrollbarHeight; + var maxNumberOfFilters = 0; + // Calculates the maximum number of filters in the columns + angular.forEach(grid.options.columnDefs, function(col) { + if (col.hasOwnProperty('filter')) { + if (maxNumberOfFilters < 1) { + maxNumberOfFilters = 1; + } + } + else if (col.hasOwnProperty('filters')) { + if (maxNumberOfFilters < col.filters.length) { + maxNumberOfFilters = col.filters.length; + } + } + }); + var filterHeight = maxNumberOfFilters * headerHeight; + + var newHeight = headerHeight + contentHeight + footerHeight + scrollbarHeight + filterHeight; $elm.css('height', newHeight + 'px');