Skip to content

Commit 2b4497d

Browse files
committed
fix(grid): fix "This condition will always return 'false' [...]" #8978
1 parent 8c28ef3 commit 2b4497d

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
? (value | currency:currencyCode:column.pipeArgs.display:column.pipeArgs.digitsInfo:grid.locale)
2727
: column.dataType === 'percent'
2828
? (value | percent:column.pipeArgs.digitsInfo:grid.locale)
29-
: column.dataType === 'boolean' && !this.formatter
29+
: column.dataType === 'boolean'
3030
? ''
3131
: value
3232
"
@@ -45,7 +45,7 @@
4545
? (value | currency:currencyCode:column.pipeArgs.display:column.pipeArgs.digitsInfo:grid.locale)
4646
: column.dataType === 'percent'
4747
? (value | percent:column.pipeArgs.digitsInfo:grid.locale)
48-
: column.dataType === 'boolean' && !this.formatter
48+
: column.dataType === 'boolean'
4949
? ''
5050
: value
5151
}}</div>
@@ -64,7 +64,7 @@
6464
(value | number:column.pipeArgs.digitsInfo:grid.locale) : (column.dataType === 'date' || column.dataType === 'time' || column.dataType === 'dateTime') ?
6565
(value | date:column.pipeArgs.format:column.pipeArgs.timezone:grid.locale) : column.dataType === 'currency' ?
6666
(value | currency:currencyCode:column.pipeArgs.display:column.pipeArgs.digitsInfo:grid.locale) : column.dataType === 'percent' ?
67-
(value | percent:column.pipeArgs.digitsInfo:grid.locale) : column.dataType === 'boolean' && !this.formatter ?
67+
(value | percent:column.pipeArgs.digitsInfo:grid.locale) : column.dataType === 'boolean' ?
6868
'' : value"
6969
[row]="rowData"
7070
[column]="this.column.field"

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
? (value | currency:currencyCode:column.pipeArgs.display:column.pipeArgs.digitsInfo:grid.locale)
1616
: column.dataType === 'percent'
1717
? (value | percent:column.pipeArgs.digitsInfo:grid.locale)
18-
: column.dataType === 'boolean' && !this.formatter
18+
: column.dataType === 'boolean'
1919
? ''
2020
: value"
2121
[row]="rowData"
@@ -25,7 +25,7 @@
2525
? (value | number:column.pipeArgs.digitsInfo:grid.locale) : (column.dataType === 'date' || column.dataType === 'time' || column.dataType === 'dateTime')
2626
? (value | date:column.pipeArgs.format:column.pipeArgs.timezone:grid.locale) : column.dataType === 'currency'
2727
? (value | currency:currencyCode:column.pipeArgs.display:column.pipeArgs.digitsInfo:grid.locale) : column.dataType === 'percent'
28-
? (value | percent:column.pipeArgs.digitsInfo:grid.locale) : column.dataType === 'boolean' && !this.formatter
28+
? (value | percent:column.pipeArgs.digitsInfo:grid.locale) : column.dataType === 'boolean'
2929
? '' : value}}</div>
3030

3131
<igx-icon
@@ -43,8 +43,8 @@
4343
(value | number:column.pipeArgs.digitsInfo:grid.locale) : (column.dataType === 'date' || column.dataType === 'time' || column.dataType === 'dateTime') ?
4444
(value | date:column.pipeArgs.format:column.pipeArgs.timezone:grid.locale) : column.dataType === 'currency'?
4545
(value | currency:currencyCode:column.pipeArgs.display:column.pipeArgs.digitsInfo:grid.locale) : column.dataType === 'percent' ?
46-
(value | percent:column.pipeArgs.digitsInfo:grid.locale) : column.dataType === 'boolean' && !this.formatter ? '' :
47-
value"
46+
(value | percent:column.pipeArgs.digitsInfo:grid.locale) : column.dataType === 'boolean' ?
47+
'' : value"
4848
[row]="rowData"
4949
[column]="this.column.field"
5050
[containerClass]="'igx-grid__td-text'"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
>
99
</ng-template>
1010
<ng-template #defaultCell>
11-
<div *ngIf="column.dataType !== 'boolean'"
11+
<div
1212
igxTextHighlight
1313
class="igx-grid__td-text"
1414
style="pointer-events: none;"
@@ -43,7 +43,7 @@
4343
? (value | currency:currencyCode:column.pipeArgs.display:column.pipeArgs.digitsInfo:grid.locale)
4444
: column.dataType === 'percent'
4545
? (value | percent:column.pipeArgs.digitsInfo:grid.locale)
46-
: column.dataType === 'boolean' && !this.formatter
46+
: column.dataType === 'boolean'
4747
? ''
4848
: value
4949
}}</div>
@@ -62,7 +62,7 @@
6262
(value | number:column.pipeArgs.digitsInfo:grid.locale) : (column.dataType === 'date' || column.dataType === 'time' || column.dataType === 'dateTime') ?
6363
(value | date:column.pipeArgs.format:column.pipeArgs.timezone:grid.locale) : column.dataType === 'currency'?
6464
(value | currency:currencyCode:column.pipeArgs.display:column.pipeArgs.digitsInfo:grid.locale) : column.dataType === 'percent' ?
65-
(value | percent:column.pipeArgs.digitsInfo:grid.locale) : column.dataType === 'boolean' && !this.formatter ?
65+
(value | percent:column.pipeArgs.digitsInfo:grid.locale) : column.dataType === 'boolean' ?
6666
'' : value"
6767
[row]="rowData"
6868
[column]="this.column.field"

0 commit comments

Comments
 (0)