Skip to content

Commit

Permalink
fix: display times properly on days where DST changes
Browse files Browse the repository at this point in the history
Fixes #964
Fixes #477
  • Loading branch information
mattlewis92 committed Aug 18, 2019
1 parent 8480e72 commit 6e139f4
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
"dependencies": {
"angular-draggable-droppable": "^4.3.2",
"angular-resizable-element": "^3.2.4",
"calendar-utils": "^0.3.1",
"calendar-utils": "^0.3.3",
"positioning": "^2.0.0"
},
"sideEffects": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { DayViewHourSegment } from 'calendar-utils';
[ngClass]="segment.cssClass"
>
<div class="cal-time">
{{ segment.date | calendarDate: 'dayViewHour':locale }}
{{ segment.displayDate | calendarDate: 'dayViewHour':locale }}
</div>
</div>
</ng-template>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import { WeekViewHourColumn } from 'calendar-utils';
[ngClass]="segment.cssClass"
>
<div class="cal-time" *ngIf="isTimeLabel">
{{ segment.date | calendarDate: 'weekViewHour':locale }}
{{ segment.displayDate | calendarDate: 'weekViewHour':locale }}
</div>
</div>
</ng-template>
Expand Down

0 comments on commit 6e139f4

Please sign in to comment.