Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/js/core/directives/ui-grid.js
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,12 @@ angular.module('ui.grid').directive('uiGrid',
// If the grid isn't tall enough to fit a single row, it's kind of useless. Resize it to fit a minimum number of rows
if (grid.gridHeight < grid.options.rowHeight) {
// Figure out the new height
var newHeight = grid.options.minRowsToShow * grid.options.rowHeight;
var contentHeight = grid.options.minRowsToShow * grid.options.rowHeight;
var headerHeight = grid.options.hideHeader ? 0 : grid.options.headerRowHeight;
var footerHeight = grid.options.showFooter ? grid.options.footerRowHeight : 0;
var scrollbarHeight = grid.options.enableScrollbars ? gridUtil.getScrollbarWidth() : 0;

var newHeight = headerHeight + contentHeight + footerHeight + scrollbarHeight;

$elm.css('height', newHeight + 'px');

Expand Down