Enh(selection): fix #2254 allow both header and row selection

Author: PaulL1

misc/tutorial/210_selection.ngdoc

@@ -15,6 +15,9 @@ By default the module will provide a row header with checkboxes that allow selec
 the `enableRowHeaderSelection` gridOption to false, then the row header is hidden and a click on the row will
 result in selection of that row.  You can see that in this tutorial for grid1 by looking at your javascript console.
 
+If you want to allow both clicking on the row, and also clicking on the rowHeader, you can set `enableFullRowSelection` to 
+true.
+
 Setting the `multiSelect` gridOption to true will allow selecting multiple rows, setting to false will allow selection
 of only one row at a time.
 
@@ -98,7 +101,12 @@ auto-selects the first row once the data is loaded.
         $scope.toggleRow1 = function() {
           $scope.gridApi.selection.toggleRowSelection($scope.gridOptions.data[0]);
         };
-        
+
+        $scope.toggleFullRowSelection = function() {
+          $scope.gridOptions.enableFullRowSelection = !$scope.gridOptions.enableFullRowSelection;
+          $scope.gridApi.core.notifyDataChange( uiGridConstants.dataChange.OPTIONS);
+        };
+
         $scope.setSelectable = function() {
           $scope.gridApi.selection.clearSelectedRows();
 
@@ -174,6 +182,7 @@ auto-selects the first row once the data is loaded.
       <button type="button" class="btn btn-success" ng-disabled="!gridApi.grid.options.multiSelect" ng-click="selectAll()">Select All</button>
       <button type="button" class="btn btn-success" ng-click="clearAll()">Clear All</button>
       <button type="button" class="btn btn-success" ng-click="setSelectable()">Set Selectable</button>
+      <button type="button" class="btn btn-success" ng-click="toggleFullRowSelection()">Toggle full row selection</button>
       <br/>
 
       <div ui-grid="gridOptions" ui-grid-selection class="grid"></div>

src/features/selection/js/selection.js

@@ -388,6 +388,16 @@
            *  <br/>Defaults to true
            */
           gridOptions.enableRowHeaderSelection = gridOptions.enableRowHeaderSelection !== false;
+          /**
+           *  @ngdoc object
+           *  @name enableFullRowSelection
+           *  @propertyOf  ui.grid.selection.api:GridOptions
+           *  @description Enable selection by clicking anywhere on the row.  Defaults to 
+           *  false if `enableRowHeaderSelection` is true, otherwise defaults to false.
+           */
+          if ( typeof(gridOptions.enableFullRowSelection) === 'undefined' ){
+            gridOptions.enableFullRowSelection = !gridOptions.enableRowHeaderSelection;
+          }
           /**
            *  @ngdoc object
            *  @name enableSelectAll
@@ -874,7 +884,7 @@
             };
 
             function registerRowSelectionEvents() {
-              if ($scope.grid.options.enableRowSelection && !$scope.grid.options.enableRowHeaderSelection) {
+              if ($scope.grid.options.enableRowSelection && $scope.grid.options.enableFullRowSelection) {
                 $elm.addClass('ui-grid-disable-selection');
                 $elm.on('touchstart', touchStart);
                 $elm.on('touchend', touchEnd);
@@ -900,10 +910,10 @@
             // register a dataChange callback so that we can change the selection configuration dynamically
             // if the user changes the options
             var dataChangeDereg = $scope.grid.registerDataChangeCallback( function() {
-              if ( $scope.grid.options.enableRowSelection && !$scope.grid.options.enableRowHeaderSelection &&
+              if ( $scope.grid.options.enableRowSelection && $scope.grid.options.enableFullRowSelection &&
                 !$scope.registered ){
                 registerRowSelectionEvents();
-              } else if ( ( !$scope.grid.options.enableRowSelection || $scope.grid.options.enableRowHeaderSelection ) &&
+              } else if ( ( !$scope.grid.options.enableRowSelection || !$scope.grid.options.enableFullRowSelection ) &&
                 $scope.registered ){
                 deregisterRowSelectionEvents();
               }