fix(gridEdit): #3373 spacebar on checkbox was incorrectly invoking de…

…ep edit mode
angular-ui · May 26, 2015 · 4d9ec8b · 4d9ec8b
1 parent a1bbc0c
commit 4d9ec8b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git 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: '<div class="ui-grid-cell-contents"><span>Friend0:{{COL_FIELD}}</span></div>'  },
         { name:'friends[1].name', displayName:'2nd friend', width:150, enableCellEdit: true, cellTemplate: '<div class="ui-grid-cell-contents"><span>Friend1:{{COL_FIELD}}</span></div>'  },
         { name:'friends[2].name', displayName:'3rd friend', width:150, enableCellEdit: true, cellTemplate: '<div class="ui-grid-cell-contents"><span>Friend2:{{COL_FIELD}}</span></div>'  },
-        { name:'agetemplate',field:'age', width:150, cellTemplate: '<div class="ui-grid-cell-contents"><span>Age 2:{{COL_FIELD}}</span></div>' }
+        { name:'agetemplate',field:'age', width:150, cellTemplate: '<div class="ui-grid-cell-contents"><span>Age 2:{{COL_FIELD}}</span></div>' },
+        { 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
         });
       });
   </file>
-</example>
+</example>
diff --git 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) {