Skip to content

Commit

Permalink
Merge pull request #4446 from IgniteUI/gedinakova/fix-4434-7.2.x
Browse files Browse the repository at this point in the history
fix(Filter): #4434 Fixed Date pipe error in IE11.
  • Loading branch information
kdinev authored Apr 11, 2019
2 parents fd35844 + 6dc704e commit 49b551e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
</igx-input-group>

<igx-date-picker #datePicker [outlet]="grid.outletDirective" [(ngModel)]="expressionUI.expression.searchVal" [locale]="grid.locale">
<ng-template igxDatePickerTemplate let-openDialog="openDialog" let-displayData="displayData">
<ng-template igxDatePickerTemplate let-openDialog="openDialog" let-value="value">
<igx-input-group #inputGroupDateValues type="box" [displayDensity]="'compact'" [supressInputAutofocus]="true">
<igx-icon igxPreffix>calendar</igx-icon>
<input #input
Expand All @@ -43,7 +43,7 @@
(click)="openDatePicker(openDialog)"
[placeholder]="inputDatePlaceholder"
autocomplete="off"
[value]="displayData | date"
[value]="value | igxdate: grid.locale"
[readonly]="true"
[disabled]="expressionUI.expression.condition && expressionUI.expression.condition.isUnary"/>
</igx-input-group>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@
</ng-template>

<ng-template #defaultDateUI>
<igx-date-picker
<igx-date-picker
tabindex="0"
[value]="value"
[outlet]="filteringService.grid.outletDirective"
[locale]="filteringService.grid.locale"
(onSelection)="onDateSelected($event)"
(onClose)="datePickerClose()">
<ng-template igxDatePickerTemplate let-openDialog="openDialog" let-displayData="displayData">
<ng-template igxDatePickerTemplate let-openDialog="openDialog">
<igx-input-group type="box" [displayDensity]="'compact'" [supressInputAutofocus]="true">
<igx-prefix #inputGroupPrefix
tabindex="0"
Expand All @@ -62,7 +62,7 @@
(click)="openDatePicker(openDialog)"
[placeholder]="placeholder"
autocomplete="off"
[value]="displayData | date"
[value]="value | igxdate: filteringService.grid.locale"
[readonly]="true"
(keydown)="onInputKeyDown($event)"/>
<igx-suffix *ngIf="value" (keydown)="onClearKeyDown($event)" (click)="clearInput()" tabindex="0">
Expand Down

0 comments on commit 49b551e

Please sign in to comment.