From a4bfade7b716a42009a59e7f8377c1ee9a3c9879 Mon Sep 17 00:00:00 2001 From: Jared Scott Date: Wed, 30 Apr 2014 20:11:32 -0700 Subject: [PATCH] viewportTopR should always have 'auto' scroll This fixes an issue when you have the following configuration ` options: { frozenColumn: 0, frozenRow: 1, frozenBottom: true } ` Basically, when you have a frozen bottom row w/ a frozen column, AND you have less rows than would fill up the height of the viewport, a disabled scrollbar is shown for the top right viewport, and it also visually overlaps the rightmost column. --- slick.grid.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slick.grid.js b/slick.grid.js index 643f27864..a5123a37c 100644 --- a/slick.grid.js +++ b/slick.grid.js @@ -1307,7 +1307,7 @@ if (typeof Slick === "undefined") { $viewportTopR.css({ 'overflow-x': ( options.frozenColumn > -1 ) ? ( hasFrozenRows ) ? 'hidden' : 'scroll' : ( hasFrozenRows ) ? 'hidden' : 'auto', - 'overflow-y': ( options.frozenColumn > -1 ) ? ( hasFrozenRows ) ? 'scroll' : 'auto' : ( hasFrozenRows ) ? 'scroll' : 'auto' + 'overflow-y': 'auto' }); $viewportBottomL.css({