inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ADF-2529] click will unselect the selected row (#3188)

Browse Source 
* [ADF-2529] click will unselect the selected row

* [ADF-2529] removed wrong comment
This commit is contained in:
Vito
2018-04-18 12:28:21 +01:00
committed by Denys Vuika
parent 5e5b0a9207
commit 5cd554e85e
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/core/datatable/components/datatable/datatable.component.spec.ts
View File

@@ -312,6 +312,9 @@ describe('DataTable', () => {
expect(rows[0].isSelected).toBeTruthy(); expect(rows[0].isSelected).toBeTruthy();
dataTable.onRowClick(rows[0], null); dataTable.onRowClick(rows[0], null);
expect(rows[0].isSelected).toBeFalsy();
dataTable.onRowClick(rows[0], <any> { metaKey: true, preventDefault() {} });
expect(rows[0].isSelected).toBeTruthy(); expect(rows[0].isSelected).toBeTruthy();
dataTable.onRowClick(rows[0], <any> { metaKey: true, preventDefault() {} }); dataTable.onRowClick(rows[0], <any> { metaKey: true, preventDefault() {} });

7
lib/core/datatable/components/datatable/datatable.component.ts
View File

@@ -317,7 +317,12 @@ export class DataTableComponent implements AfterContentInit, OnChanges, DoCheck
if (this.isMultiSelectionMode()) { if (this.isMultiSelectionMode()) {
const modifier = e && (e.metaKey || e.ctrlKey); const modifier = e && (e.metaKey || e.ctrlKey);
const newValue = modifier ? !row.isSelected : true; let newValue: boolean;
if (this.selection.length === 1) {
newValue = !row.isSelected;
} else {
newValue = modifier ? !row.isSelected : true;
}
const domEventName = newValue ? 'row-select' : 'row-unselect'; const domEventName = newValue ? 'row-select' : 'row-unselect';
if (!modifier) { if (!modifier) {