diff options
| -rw-r--r-- | slick.grid.js | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/slick.grid.js b/slick.grid.js index d02891a..7332478 100644 --- a/slick.grid.js +++ b/slick.grid.js @@ -186,6 +186,7 @@ if (typeof Slick === "undefined") { scrollbarDimensions = scrollbarDimensions || measureScrollbar(); options = $.extend({}, defaults, options); + validateAndEnforceOptions(); columnDefaults.width = options.defaultColumnWidth; columnsById = {}; @@ -1183,11 +1184,18 @@ if (typeof Slick === "undefined") { } options = $.extend(options, args); + validateAndEnforceOptions(); $viewport.css("overflow-y", options.autoHeight ? "hidden" : "auto"); render(); } + function validateAndEnforceOptions() { + if (options.autoHeight) { + options.leaveSpaceForNewRows = false; + } + } + function setData(newData, scrollToTop) { data = newData; invalidateAllRows(); @@ -1497,7 +1505,7 @@ if (typeof Slick === "undefined") { function resizeCanvas() { if (!initialized) { return; } if (options.autoHeight) { - viewportH = options.rowHeight * (getDataLength() + (options.enableAddRow ? 1 : 0) + (options.leaveSpaceForNewRows ? numVisibleRows - 1 : 0)); + viewportH = options.rowHeight * (getDataLength() + (options.enableAddRow ? 1 : 0)); } else { viewportH = getViewportHeight(); } |