Skip to content

Commit 1eda93a

Browse files
authored
Merge branch '9.0.x' into mdragnev/fix-6931-9.0.x
2 parents ef8273a + a16fb03 commit 1eda93a

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

projects/igniteui-angular/src/lib/grids/grid/grid.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,8 @@
158158
<ng-container *ngTemplateOutlet="template"></ng-container>
159159
<div class="igx-grid__row-editing-outlet" igxOverlayOutlet #igxRowEditingOverlayOutlet></div>
160160
</div>
161-
<div [style.display]="shouldOverlayLoading ? 'flex' : 'none'" #loadingOverlay>
162-
<igx-circular-bar [indeterminate]="true">
161+
<div #loadingOverlay>
162+
<igx-circular-bar [indeterminate]="true" *ngIf='shouldOverlayLoading'>
163163
</igx-circular-bar>
164164
</div>
165165
<span *ngIf="hasMovableColumns && draggedColumn" [igxColumnMovingDrop]="headerContainer" [attr.droppable]="true"

projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@
6161
<igx-grid-filtering-row #filteringRow [style.width.px]='calcWidth' *ngIf="filteringService.isFilterRowVisible"
6262
[column]="filteringService.filteredColumn"></igx-grid-filtering-row>
6363
</div>
64-
<div [style.display]="shouldOverlayLoading ? 'flex' : 'none'" #loadingOverlay>
65-
<igx-circular-bar [indeterminate]="true">
64+
<div #loadingOverlay>
65+
<igx-circular-bar [indeterminate]="true" *ngIf='shouldOverlayLoading'>
6666
</igx-circular-bar>
6767
</div>
6868
<span *ngIf="hasMovableColumns && draggedColumn" [igxColumnMovingDrop]="headerContainer" [attr.droppable]="true"

projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid.component.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
[column]="filteringService.filteredColumn"></igx-grid-filtering-row>
5151
</div>
5252
<div class="igx-grid__thead-thumb" [hidden]='!hasVerticalSroll()' [style.width.px]="scrollWidth"></div>
53-
<div [style.display]="shouldOverlayLoading ? 'flex' : 'none'" #loadingOverlay>
54-
<igx-circular-bar [indeterminate]="true">
53+
<div #loadingOverlay>
54+
<igx-circular-bar [indeterminate]="true" *ngIf='shouldOverlayLoading'>
5555
</igx-circular-bar>
5656
</div>
5757
<span *ngIf="hasMovableColumns && draggedColumn" [igxColumnMovingDrop]="headerContainer" [attr.droppable]="true"

0 commit comments

Comments
 (0)