diff options
| author | Michael Leibman <michael.leibman@gmail.com> | 2012-08-06 14:38:07 -0700 |
|---|---|---|
| committer | mleibman <michael.leibman@gmail.com> | 2012-08-06 14:38:07 -0700 |
| commit | 6d3b8a0844a0ef8528b11e67ef0bd0f5265d1c7b (patch) | |
| tree | 4212aa664750b6751651eb25c1d0ff7b312ac5eb /slick.grid.js | |
| parent | f2fa92a914655187aeffae64c5a5a78cc231854f (diff) | |
| download | SlickGrid-6d3b8a0844a0ef8528b11e67ef0bd0f5265d1c7b.zip SlickGrid-6d3b8a0844a0ef8528b11e67ef0bd0f5265d1c7b.tar.gz SlickGrid-6d3b8a0844a0ef8528b11e67ef0bd0f5265d1c7b.tar.bz2 | |
Fix issue #414 - don't set the viewport height if options.autoHeight is set. Let it expand to content.
Diffstat (limited to 'slick.grid.js')
| -rw-r--r-- | slick.grid.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/slick.grid.js b/slick.grid.js index 195e702..1666200 100644 --- a/slick.grid.js +++ b/slick.grid.js @@ -1500,7 +1500,9 @@ if (typeof Slick === "undefined") { numVisibleRows = Math.ceil(viewportH / options.rowHeight); viewportW = parseFloat($.css($container[0], "width", true)); - $viewport.height(viewportH); + if (!options.autoHeight) { + $viewport.height(viewportH); + } if (options.forceFitColumns) { autosizeColumns(); |