summaryrefslogtreecommitdiffstats
path: root/slick.grid.js
diff options
context:
space:
mode:
authormleibman <michael.leibman@gmail.com>2010-12-17 22:20:05 -0800
committermleibman <michael.leibman@gmail.com>2010-12-17 22:21:34 -0800
commitc13ff9420a2d9df8a15372760a94f35cccd0675a (patch)
tree48518475a5ac9731480d1a39e87fb5b232d941bf /slick.grid.js
parentaef2ee2cda172d134f8359d6b6780b6791a5f077 (diff)
parent856ea33f2d67379bfa908902425ffe93ae4ce514 (diff)
downloadSlickGrid-c13ff9420a2d9df8a15372760a94f35cccd0675a.zip
SlickGrid-c13ff9420a2d9df8a15372760a94f35cccd0675a.tar.gz
SlickGrid-c13ff9420a2d9df8a15372760a94f35cccd0675a.tar.bz2
Merge fix.
Diffstat (limited to 'slick.grid.js')
-rw-r--r--slick.grid.js10
1 files changed, 6 insertions, 4 deletions
diff --git a/slick.grid.js b/slick.grid.js
index d39673d..fbe0e80 100644
--- a/slick.grid.js
+++ b/slick.grid.js
@@ -1687,12 +1687,14 @@ if (typeof Slick === "undefined") {
}
function setFocus() {
- // IE7 tries to scroll the viewport so that the item being focused is aligned to the left border
+ // IE tries to scroll the viewport so that the item being focused is aligned to the left border
// IE-specific .setActive() sets the focus, but doesn't scroll
- if ($.browser.msie && parseInt($.browser.version) < 8)
+ if ($.browser.msie) {
$canvas[0].setActive();
- else
+ }
+ else {
$canvas[0].focus();
+ }
}
function scrollActiveCellIntoView() {
@@ -1706,7 +1708,7 @@ if (typeof Slick === "undefined") {
$viewport.scrollLeft(left);
else if (right > scrollRight)
$viewport.scrollLeft(Math.min(left, right - $viewport[0].clientWidth));
- }
+ }
}
function setActiveCellInternal(newCell, editMode) {