hotfix for bad behaviors

TonyGermaneri · Jan 12, 2017 · c68b3f8 · c68b3f8
1 parent f2636be
commit c68b3f8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/lib/main.js b/lib/main.js
@@ -976,7 +976,7 @@
             scrollBox.height = height - headerCellHeight - headerCellBorder;
             scrollBox.top = headerCellHeight + headerCellBorder;
             scrollBox.left = headerCellWidth;
-            scrollBox.scrollHeight = scrollHeight - headerCellBorder + getHeaderCellHeight() + style.scrollBarWidth - height;
+            scrollBox.scrollHeight = scrollHeight - headerCellBorder + getHeaderCellHeight() + style.scrollBarWidth;
             scrollBox.scrollWidth = scrollWidth - style.scrollBarWidth
                 + getHeaderCellWidth() + (style.scrollBarWidth * 2) - width;
             scrollBox.scrollBarHeight = 15;
@@ -2193,6 +2193,7 @@
             if (!hasFocus) { return; }
             scrollBox.scrollTop -= e.wheelDeltaY;
             scrollBox.scrollLeft -= e.wheelDeltaX;
+            e.preventDefault();
         }
         function copy(e) {
             var rows = [], sData = getSelectedData();

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "canvas-datagrid",
-  "version": "0.9.24",
+  "version": "0.9.25",
   "description": "Canvas based data grid",
   "main": "./lib/main.js",
   "scripts": {