Skip to content

Commit 4d9ec8b

Browse files
committed
fix(gridEdit): #3373 spacebar on checkbox was incorrectly invoking deep edit mode
1 parent a1bbc0c commit 4d9ec8b

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

misc/tutorial/401_AllFeatures.ngdoc

+4-3
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ All features are enabled to get an idea of performance
4848
{ name:'friends[0].name', displayName:'1st friend', width:150, enableCellEdit: true, cellTemplate: '<div class="ui-grid-cell-contents"><span>Friend0:{{COL_FIELD}}</span></div>' },
4949
{ name:'friends[1].name', displayName:'2nd friend', width:150, enableCellEdit: true, cellTemplate: '<div class="ui-grid-cell-contents"><span>Friend1:{{COL_FIELD}}</span></div>' },
5050
{ name:'friends[2].name', displayName:'3rd friend', width:150, enableCellEdit: true, cellTemplate: '<div class="ui-grid-cell-contents"><span>Friend2:{{COL_FIELD}}</span></div>' },
51-
{ name:'agetemplate',field:'age', width:150, cellTemplate: '<div class="ui-grid-cell-contents"><span>Age 2:{{COL_FIELD}}</span></div>' }
51+
{ name:'agetemplate',field:'age', width:150, cellTemplate: '<div class="ui-grid-cell-contents"><span>Age 2:{{COL_FIELD}}</span></div>' },
52+
{ name:'Is Active',field:'isActive', width:150, type:'boolean' }
5253
];
5354

5455
$scope.callsPending = 0;
@@ -60,7 +61,7 @@ All features are enabled to get an idea of performance
6061
var start = new Date();
6162
var sec = $interval(function () {
6263
$scope.callsPending++;
63-
64+
6465
$http.get('/data/500_complex.json')
6566
.success(function(data) {
6667
$scope.callsPending--;
@@ -114,4 +115,4 @@ All features are enabled to get an idea of performance
114115
});
115116
});
116117
</file>
117-
</example>
118+
</example>

src/features/edit/js/gridEdit.js

+3-1
Original file line numberDiff line numberDiff line change
@@ -863,7 +863,9 @@
863863
};
864864

865865
$elm.on('click', function (evt) {
866-
$scope.deepEdit = true;
866+
if ($elm[0].type !== 'checkbox') {
867+
$scope.deepEdit = true;
868+
}
867869
});
868870

869871
$elm.on('keydown', function (evt) {

0 commit comments

Comments
 (0)