From 4d9ec8b5774b6beeaab05909a7a493aa6f16e72c Mon Sep 17 00:00:00 2001 From: swalters Date: Tue, 26 May 2015 16:14:32 -0500 Subject: [PATCH] fix(gridEdit): #3373 spacebar on checkbox was incorrectly invoking deep edit mode --- misc/tutorial/401_AllFeatures.ngdoc | 7 ++++--- src/features/edit/js/gridEdit.js | 4 +++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/misc/tutorial/401_AllFeatures.ngdoc b/misc/tutorial/401_AllFeatures.ngdoc index f57edc8a4f..507a765371 100644 --- a/misc/tutorial/401_AllFeatures.ngdoc +++ b/misc/tutorial/401_AllFeatures.ngdoc @@ -48,7 +48,8 @@ All features are enabled to get an idea of performance { name:'friends[0].name', displayName:'1st friend', width:150, enableCellEdit: true, cellTemplate: '
Friend0:{{COL_FIELD}}
' }, { name:'friends[1].name', displayName:'2nd friend', width:150, enableCellEdit: true, cellTemplate: '
Friend1:{{COL_FIELD}}
' }, { name:'friends[2].name', displayName:'3rd friend', width:150, enableCellEdit: true, cellTemplate: '
Friend2:{{COL_FIELD}}
' }, - { name:'agetemplate',field:'age', width:150, cellTemplate: '
Age 2:{{COL_FIELD}}
' } + { name:'agetemplate',field:'age', width:150, cellTemplate: '
Age 2:{{COL_FIELD}}
' }, + { name:'Is Active',field:'isActive', width:150, type:'boolean' } ]; $scope.callsPending = 0; @@ -60,7 +61,7 @@ All features are enabled to get an idea of performance var start = new Date(); var sec = $interval(function () { $scope.callsPending++; - + $http.get('/data/500_complex.json') .success(function(data) { $scope.callsPending--; @@ -114,4 +115,4 @@ All features are enabled to get an idea of performance }); }); - \ No newline at end of file + diff --git a/src/features/edit/js/gridEdit.js b/src/features/edit/js/gridEdit.js index 6e801b2bad..bab463bfff 100644 --- a/src/features/edit/js/gridEdit.js +++ b/src/features/edit/js/gridEdit.js @@ -863,7 +863,9 @@ }; $elm.on('click', function (evt) { - $scope.deepEdit = true; + if ($elm[0].type !== 'checkbox') { + $scope.deepEdit = true; + } }); $elm.on('keydown', function (evt) {