Skip to content

Commit

Permalink
Merge pull request #339 from 6pac/bugfix/overflow-scrolling
Browse files Browse the repository at this point in the history
fix(overflow-scrolling): remove old patch now unnecessary, closes #332
  • Loading branch information
6pac authored Feb 9, 2019
2 parents beaa586 + fcab948 commit f44a398
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions slick.grid.js
Original file line number Diff line number Diff line change
Expand Up @@ -576,11 +576,6 @@ if (typeof Slick === "undefined") {
.on("mouseenter", ".slick-cell", handleMouseEnter)
.on("mouseleave", ".slick-cell", handleMouseLeave);

// Work around http://crbug.com/312427.
if (navigator.userAgent.toLowerCase().match(/webkit/) &&
navigator.userAgent.toLowerCase().match(/macintosh/)) {
$canvas.on("mousewheel", handleMouseWheel);
}
restoreCssFromHiddenInit();
}
}
Expand Down Expand Up @@ -4549,7 +4544,7 @@ if (typeof Slick === "undefined") {

function scrollPage(dir) {
var deltaRows = dir * numVisibleRows;
/// First fully visible row crosses the line with
/// First fully visible row crosses the line with
/// y == bottomOfTopmostFullyVisibleRow
var bottomOfTopmostFullyVisibleRow = scrollTop + options.rowHeight - 1;
scrollTo((getRowFromPosition(bottomOfTopmostFullyVisibleRow) + deltaRows) * options.rowHeight);
Expand Down

0 comments on commit f44a398

Please sign in to comment.