Permalink
Browse files

Merge branch '2.0-frozenRowsAndColumns' into gh-pages

  • Loading branch information...
2 parents db2cb1f + 170124f commit d38eea2ed09ba52f2386421089e0b6a6a66599c2 @JLynch7 committed Nov 12, 2011
@@ -95,7 +95,7 @@
<script language="JavaScript" src="../lib/firebugx.js"></script>
- <script src="../lib/jquery-1.6.4.min.js"></script>
+ <script src="../lib/jquery-1.7.min.js"></script>
<script language="JavaScript" src="../lib/jquery-ui-1.8.16.custom.min.js"></script>
<script src="../lib/jquery.event.drag-2.0.min.js"></script>
@@ -90,7 +90,7 @@
<script language="JavaScript" src="../lib/firebugx.js"></script>
- <script src="../lib/jquery-1.6.4.min.js"></script>
+ <script src="../lib/jquery-1.7.min.js"></script>
<script language="JavaScript" src="../lib/jquery-ui-1.8.16.custom.min.js"></script>
<script src="../lib/jquery.event.drag-2.0.min.js"></script>
@@ -90,7 +90,7 @@
<script language="JavaScript" src="../lib/firebugx.js"></script>
- <script src="../lib/jquery-1.6.4.min.js"></script>
+ <script src="../lib/jquery-1.7.min.js"></script>
<script language="JavaScript" src="../lib/jquery-ui-1.8.16.custom.min.js"></script>
<script src="../lib/jquery.event.drag-2.0.min.js"></script>
View
@@ -2243,10 +2243,9 @@ if (typeof Slick === "undefined") {
// 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) {
- $canvas[0].setActive();
- }
- else {
- $canvas[0].focus();
+ $(activeCellNode).parents( '.gid-canvas' ).setActive();
+ } else {
+ $(activeCellNode).parents( '.gid-canvas' ).focus();
}
}

0 comments on commit d38eea2

Please sign in to comment.