fix(gridEdit.js): Move deregister events until event conclusion.

fix #6384

Author: Portugal, Marcelo

src/features/edit/js/gridEdit.js

@@ -1224,8 +1224,8 @@
    *
    */
   module.directive('uiGridEditFileChooser',
-    ['gridUtil', 'uiGridConstants', 'uiGridEditConstants','$timeout',
-      function (gridUtil, uiGridConstants, uiGridEditConstants, $timeout) {
+    ['gridUtil', 'uiGridConstants', 'uiGridEditConstants',
+      function (gridUtil, uiGridConstants, uiGridEditConstants) {
         return {
           scope: true,
           require: ['?^uiGrid', '?^uiGridRenderContainer'],
@@ -1234,7 +1234,7 @@
               pre: function ($scope, $elm, $attrs) {
 
               },
-              post: function ($scope, $elm, $attrs, controllers) {
+              post: function ($scope, $elm) {
                 function handleFileSelect(event) {
                   var target = event.srcElement || event.target;
 
@@ -1286,6 +1286,7 @@
                   } else {
                     $scope.$emit(uiGridEditConstants.events.CANCEL_CELL_EDIT);
                   }
+                  $elm[0].removeEventListener('change', handleFileSelect, false);
                 }
 
                 $elm[0].addEventListener('change', handleFileSelect, false);
@@ -1294,16 +1295,11 @@
                   $elm[0].focus();
                   $elm[0].select();
 
-                  $elm.on('blur', function (evt) {
+                  $elm.on('blur', function () {
                     $scope.$emit(uiGridEditConstants.events.END_CELL_EDIT);
+                    $elm.off();
                   });
                 });
-
-                $scope.$on('$destroy', function unbindEvents() {
-                  // unbind jquery events to prevent memory leaks
-                  $elm.off();
-                  $elm[0].removeEventListener('change', handleFileSelect, false);
-                });
               }
             };
           }

src/features/edit/test/uiGridEditFileChooserDirective.spec.js

@@ -96,16 +96,4 @@ describe('ui.grid.edit uiGridEditFileChooser', function() {
 			$scope.$emit.calls.reset();
 		});
 	});
-	describe('on $destroy', function() {
-		beforeEach(function() {
-			spyOn(fileChooser[0], 'removeEventListener').and.callThrough();
-			$scope.$broadcast('$destroy');
-		});
-		afterEach(function() {
-			fileChooser[0].removeEventListener.calls.reset();
-		});
-		it('should remove all event handlers', function() {
-			expect(fileChooser[0].removeEventListener).toHaveBeenCalled();
-		});
-	});
 });