Merge remote-tracking branch 'origin/master'

Conflicts: src/features/cellnav/js/cellnav.js src/features/cellnav/test/uiGridCellNavDirective.spec.js
angular-ui · Jan 8, 2015 · 30df7d4 · 30df7d4
2 parents 6da2f21 + 0b48c1a
commit 30df7d4
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/features/cellnav/test/uiGridCellNavDirective.spec.js b/src/features/cellnav/test/uiGridCellNavDirective.spec.js
@@ -14,12 +14,12 @@ describe('ui.grid.cellNav directive', function () {
       modifierKeysToMultiSelectCells: true
     };
 
-    $scope.gridOpts.onRegisterApi = function(gridApi){
+    $scope.gridOpts.onRegisterApi = function (gridApi) {
       $scope.gridApi = gridApi;
+      $scope.grid = gridApi.grid;
     };
 
-
-
+    elm = angular.element('<div ui-grid="gridOpts" ui-grid-cellNav></div>');
     $scope.gridOpts.onRegisterApi = function (gridApi) {
       $scope.gridApi = gridApi;
       $scope.grid = gridApi.grid;