summaryrefslogtreecommitdiffstats
path: root/slick.grid.js
diff options
context:
space:
mode:
Diffstat (limited to 'slick.grid.js')
-rw-r--r--slick.grid.js4
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();