From 763c83daa777b251fa6f03ab361818e59175924f Mon Sep 17 00:00:00 2001 From: Boris Date: Fri, 23 Aug 2019 09:07:56 +0300 Subject: [PATCH] refactor(grid-base): rename headerCheckboxAriaLabel to headSelectorBaseAriaLabel --- .../igniteui-angular/src/lib/grids/grid-base.component.ts | 6 +++--- .../igniteui-angular/src/lib/grids/grid/grid.component.html | 2 +- .../hierarchical-grid/hierarchical-grid.component.html | 2 +- .../src/lib/grids/tree-grid/tree-grid.component.html | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/projects/igniteui-angular/src/lib/grids/grid-base.component.ts b/projects/igniteui-angular/src/lib/grids/grid-base.component.ts index 55988214c50..6c78ae7c779 100644 --- a/projects/igniteui-angular/src/lib/grids/grid-base.component.ts +++ b/projects/igniteui-angular/src/lib/grids/grid-base.component.ts @@ -4733,10 +4733,10 @@ export abstract class IgxGridBaseComponent extends DisplayDensityBase implements /** * @hidden */ - get headerCheckboxAriaLabel() { + get headSelectorBaseAriaLabel() { return this._filteringExpressionsTree.filteringOperands.length > 0 ? - this.headerCheckbox && this.selectionService.areAllRowSelected() ? 'Deselect all filtered' : 'Select all filtered' : - this.headerCheckbox && this.selectionService.areAllRowSelected() ? 'Deselect all' : 'Select all'; + this.headSelectorBaseTemplate && this.selectionService.areAllRowSelected() ? 'Deselect all filtered' : 'Select all filtered' : + this.headSelectorBaseTemplate && this.selectionService.areAllRowSelected() ? 'Deselect all' : 'Select all'; } /** diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid.component.html b/projects/igniteui-angular/src/lib/grids/grid/grid.component.html index 02eba1fff03..fef94161dc2 100644 --- a/projects/igniteui-angular/src/lib/grids/grid/grid.component.html +++ b/projects/igniteui-angular/src/lib/grids/grid/grid.component.html @@ -249,7 +249,7 @@ [ngStyle]="{'visibility': isMultiRowSelectionEnabled? 'visible' : 'hidden' }" (click)="$event.preventDefault()" [indeterminate]="selectionService.hasSomeRowSelected()" - [aria-label]="headerCheckboxAriaLabel" + [aria-label]="headSelectorBaseAriaLabel" #headerCheckbox> diff --git a/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.component.html b/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.component.html index 3effe4b0df4..829fb27fe22 100644 --- a/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.component.html +++ b/projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.component.html @@ -217,7 +217,7 @@ [ngStyle]="{'visibility': isMultiRowSelectionEnabled? 'visible' : 'hidden' }" (click)="$event.preventDefault()" [indeterminate]="selectionService.hasSomeRowSelected()" - [aria-label]="headerCheckboxAriaLabel" + [aria-label]="headSelectorBaseAriaLabel" #headerCheckbox> diff --git a/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid.component.html b/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid.component.html index bd684500337..e8775de2330 100644 --- a/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid.component.html +++ b/projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid.component.html @@ -198,7 +198,7 @@ (click)="$event.preventDefault()" disableRipple="true" [indeterminate]="selectionService.hasSomeRowSelected()" - [aria-label]="headerCheckboxAriaLabel" + [aria-label]="headSelectorBaseAriaLabel" #headerCheckbox>