fix(selection): Fix multiSelect + modifierKeysToMultiSelect

mportuga · web-flow · commit 2bc8c7b42ce8 · 2018-07-04T20:49:53.000-04:00
Revert part of 2485652 (#6793) fix #6791
diff --git a/src/features/selection/js/selection.js b/src/features/selection/js/selection.js
@@ -955,7 +955,8 @@
               }
               else if ($scope.grid.options.enableSelectRowOnFocus) {
                 uiGridSelectionService.toggleRowSelection($scope.grid, $scope.row, evt,
-                  false, $scope.grid.options.noUnselect);
+                  ($scope.grid.options.multiSelect && !$scope.grid.options.modifierKeysToMultiSelect),
+                  $scope.grid.options.noUnselect);
               }
               $scope.row.setFocused(!$scope.row.isFocused);
               $scope.grid.api.selection.raise.rowFocusChanged($scope.row, evt);

Original file line number	Diff line number	Diff line change
`@@ -955,7 +955,8 @@`
`955`	`955`	`}`
`956`	`956`	`else if ($scope.grid.options.enableSelectRowOnFocus) {`
`957`	`957`	`uiGridSelectionService.toggleRowSelection($scope.grid, $scope.row, evt,`
`958`		`- false, $scope.grid.options.noUnselect);`
	`958`	`+ ($scope.grid.options.multiSelect && !$scope.grid.options.modifierKeysToMultiSelect),`
	`959`	`+ $scope.grid.options.noUnselect);`
`959`	`960`	`}`
`960`	`961`	`$scope.row.setFocused(!$scope.row.isFocused);`
`961`	`962`	`$scope.grid.api.selection.raise.rowFocusChanged($scope.row, evt);`