Commit 9fa6d746 by Malcolm Blaney

Typo in last commit that was used to check previous code still

worked as expected...
parent b9eedb37
Pipeline #18278982 passed with stage
in 1 minute 13 seconds
......@@ -439,7 +439,7 @@ var dataLength=getDataLength();var dataLengthIncludingAddNew=getDataLengthInclud
(options.leaveSpaceForNewRows?numVisibleRows-1:0);var oldViewportHasVScroll=viewportHasVScroll;viewportHasVScroll=!options.autoHeight&&(numberOfRows*options.rowHeight>viewportH);viewportHasHScroll=(canvasWidth>viewportW-scrollbarDimensions.width);makeActiveCellNormal();var r1=dataLength-1;for(var i in rowsCache){if(i>r1){removeRowFromCache(i);}}
if(options.enableAsyncPostRenderCleanup){startPostProcessingCleanup();}
if(activeCellNode&&activeRow>r1){resetActiveCell();}
var oldH=h;if(!options.autoHeight){h=options.rowHeight*numberOfRows;}else{th=Math.max(options.rowHeight*numberOfRows,viewportH-scrollbarDimensions.height);if(th<maxSupportedCssHeight){h=ph=th;n=1;cj=0;}else{h=maxSupportedCssHeight;ph=h/100;n=Math.floor(th/ph);cj=(th-h)/(n-1);}}
var oldH=h;if(options.autoHeight){h=options.rowHeight*numberOfRows;}else{th=Math.max(options.rowHeight*numberOfRows,viewportH-scrollbarDimensions.height);if(th<maxSupportedCssHeight){h=ph=th;n=1;cj=0;}else{h=maxSupportedCssHeight;ph=h/100;n=Math.floor(th/ph);cj=(th-h)/(n-1);}}
if(h!==oldH){$canvas.css("height",h);scrollTop=$viewport[0].scrollTop;}
var oldScrollTopInRange=(scrollTop+offset<=th-viewportH);if(th==0||scrollTop==0){page=offset=0;}else if(oldScrollTopInRange){scrollTo(scrollTop+offset);}else{scrollTo(th-viewportH);}
if(h!=oldH&&options.autoHeight){resizeCanvas();}
......
......@@ -4364,7 +4364,7 @@ if (typeof Slick === "undefined") {
}
var oldH = h;
if (!options.autoHeight) {
if (options.autoHeight) {
h = options.rowHeight * numberOfRows;
} else {
th = Math.max(options.rowHeight * numberOfRows, viewportH - scrollbarDimensions.height);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment