Merge pull request #2600 from PaulL1/1746_cell_edit

Fix #1957 (edit): cancel all eventHandlers
angular-ui · Jan 21, 2015 · 35375f2 · 35375f2
2 parents 270d031 + ba958b5
commit 35375f2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/features/edit/js/gridEdit.js b/src/features/edit/js/gridEdit.js
@@ -645,19 +645,25 @@
                 endEdit(true);
                 $scope.grid.api.edit.raise.afterCellEdit($scope.row.entity, $scope.col.colDef, cellModel($scope), origCellValue);
                 deregOnGridScroll();
+                deregOnEndCellEdit();
+                deregOnCancelCellEdit();
               });
 
               //end editing
               var deregOnEndCellEdit = $scope.$on(uiGridEditConstants.events.END_CELL_EDIT, function (evt, retainFocus) {
                 endEdit(retainFocus);
                 $scope.grid.api.edit.raise.afterCellEdit($scope.row.entity, $scope.col.colDef, cellModel($scope), origCellValue);
                 deregOnEndCellEdit();
+                deregOnGridScroll();
+                deregOnCancelCellEdit();
               });
 
               //cancel editing
               var deregOnCancelCellEdit = $scope.$on(uiGridEditConstants.events.CANCEL_CELL_EDIT, function () {
                 cancelEdit();
                 deregOnCancelCellEdit();
+                deregOnGridScroll();
+                deregOnEndCellEdit();
               });
 
               $scope.$broadcast(uiGridEditConstants.events.BEGIN_CELL_EDIT);

diff --git a/test/unit/core/row-filtering.spec.js b/test/unit/core/row-filtering.spec.js
@@ -1,4 +1,4 @@
-ddescribe('rowSearcher', function() {
+describe('rowSearcher', function() {
   var grid, $scope, $compile, recompile,
       rows, columns, rowSearcher, uiGridConstants, filter;