fix(cellNav): IE was scrolling the viewPort to the end when the focus…

…er div received focus. Solution was to move focuser element to the render Container div
angular-ui · May 6, 2015 · aa56355 · aa56355 · rangoy · Jun 16, 2015
1 parent efd3798
commit aa56355
Showing 1 changed file with 26 additions and 17 deletions.
diff --git a/src/features/cellnav/js/cellnav.js b/src/features/cellnav/js/cellnav.js
@@ -726,8 +726,8 @@
       };
     }]);
 
-  module.directive('uiGridRenderContainer', ['$timeout', '$document', 'gridUtil', 'uiGridConstants', 'uiGridCellNavService', 'uiGridCellNavConstants','$log',
-    function ($timeout, $document, gridUtil, uiGridConstants, uiGridCellNavService, uiGridCellNavConstants, $log) {
+  module.directive('uiGridRenderContainer', ['$timeout', '$document', 'gridUtil', 'uiGridConstants', 'uiGridCellNavService', '$compile',
+    function ($timeout, $document, gridUtil, uiGridConstants, uiGridCellNavService, $compile) {
       return {
         replace: true,
         priority: -99999, //this needs to run very last
@@ -746,9 +746,32 @@
 
               var grid = uiGridCtrl.grid;
 
+              // focusser only created for body
+              if (containerId !== 'body') {
+                return;
+              }
+
               // Needs to run last after all renderContainers are built
               uiGridCellNavService.decorateRenderContainers(grid);
 
+              //add an element with no dimensions that can be used to set focus and capture keystrokes
+              var focuser = $compile('<div class="ui-grid-focuser" tabindex="-1"></div>')($scope);
+              $elm.append(focuser);
+
+              uiGridCtrl.focus = function () {
+                focuser[0].focus();
+              };
+
+              // Bind to keydown events in the render container
+              focuser.on('keydown', function (evt) {
+                evt.uiGridTargetRenderContainerId = containerId;
+                var rowCol = uiGridCtrl.grid.api.cellNav.getFocusedCell();
+                var result = uiGridCtrl.cellNav.handleKeyDown(evt);
+                if (result === null) {
+                  uiGridCtrl.grid.api.cellNav.raise.viewPortKeyDown(evt, rowCol);
+                }
+              });
+
             }
           };
         }
@@ -781,25 +804,11 @@
 
               var grid = uiGridCtrl.grid;
 
-              //add an element with no dimensions that can be used to set focus and capture keystrokes
-              var focuser = $compile('<div class="ui-grid-focuser" tabindex="-1"></div>')($scope);
-              $elm.append(focuser);
 
-              uiGridCtrl.focus = function () {
-                focuser[0].focus();
-              };
 
               uiGridCtrl.focus();
 
-              // Bind to keydown events in the render container
-              focuser.on('keydown', function (evt) {
-                evt.uiGridTargetRenderContainerId = containerId;
-                var rowCol = uiGridCtrl.grid.api.cellNav.getFocusedCell();
-                var result = uiGridCtrl.cellNav.handleKeyDown(evt);
-                if (result === null) {
-                  uiGridCtrl.grid.api.cellNav.raise.viewPortKeyDown(evt, rowCol);
-                }
-              });
+
 
               grid.api.core.on.scrollBegin($scope, function (args) {