Skip to content

Commit a7975d2

Browse files
author
Tobias Schweizer
committed
refactor (MatCalendar): some code reformatting
1 parent e36dc71 commit a7975d2

File tree

5 files changed

+76
-79
lines changed

5 files changed

+76
-79
lines changed

package-lock.json

Lines changed: 54 additions & 54 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
11
<div class="mat-calendar-header">
2+
<div class="mat-calendar-controls">
3+
<button mat-button class="mat-calendar-period-button"
4+
(click)="calendar.currentPeriodClicked()" [attr.aria-label]="calendar.periodButtonLabel">
5+
{{calendar.periodButtonText}}
6+
<div class="mat-calendar-arrow" [class.mat-calendar-invert]="calendar.currentView != 'month'"></div>
7+
</button>
28

3-
<div class="mat-calendar-controls">
4-
<button mat-button class="mat-calendar-period-button"
5-
(click)="calendar.currentPeriodClicked()" [attr.aria-label]="calendar.periodButtonLabel">
6-
{{calendar.periodButtonText}}
7-
<div class="mat-calendar-arrow" [class.mat-calendar-invert]="calendar.currentView != 'month'"></div>
8-
</button>
9+
<div class="mat-calendar-spacer"></div>
910

10-
<div class="mat-calendar-spacer"></div>
11+
<button mat-icon-button class="mat-calendar-previous-button"
12+
[disabled]="!calendar.previousEnabled()" (click)="calendar.previousClicked()"
13+
[attr.aria-label]="calendar.prevButtonLabel">
14+
</button>
1115

12-
<button mat-icon-button class="mat-calendar-previous-button"
13-
[disabled]="!calendar.previousEnabled()" (click)="calendar.previousClicked()"
14-
[attr.aria-label]="calendar.prevButtonLabel">
15-
</button>
16-
17-
<button mat-icon-button class="mat-calendar-next-button"
18-
[disabled]="!calendar.nextEnabled()" (click)="calendar.nextClicked()"
19-
[attr.aria-label]="calendar.nextButtonLabel">
20-
</button>
21-
</div>
22-
</div>
16+
<button mat-icon-button class="mat-calendar-next-button"
17+
[disabled]="!calendar.nextEnabled()" (click)="calendar.nextClicked()"
18+
[attr.aria-label]="calendar.nextButtonLabel">
19+
</button>
20+
</div>
21+
</div>

src/lib/datepicker/calendar.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ describe('MatCalendar', () => {
1919
beforeEach(async(() => {
2020
TestBed.configureTestingModule({
2121
imports: [
22-
MatNativeDateModule,
23-
MatDatepickerModule,
22+
MatNativeDateModule,
23+
MatDatepickerModule,
2424
],
2525
declarations: [
2626
// Test components.

src/lib/datepicker/calendar.ts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,7 @@ import {ComponentPortal, ComponentType, Portal} from '@angular/cdk/portal';
4242
changeDetection: ChangeDetectionStrategy.OnPush,
4343
})
4444
export class MatCalendarHeader {
45-
constructor(@Host() public calendar: MatCalendar<any>) {
46-
47-
}
45+
constructor(@Host() public calendar: MatCalendar<any>) {}
4846
}
4947

5048
/**

src/lib/datepicker/datepicker-content.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
[minDate]="datepicker._minDate"
77
[maxDate]="datepicker._maxDate"
88
[dateFilter]="datepicker._dateFilter"
9+
[headerComponent]="datepicker.calendarHeaderComponent"
910
[selected]="datepicker._selected"
1011
(selectedChange)="datepicker._select($event)"
1112
(yearSelected)="datepicker._selectYear($event)"
1213
(monthSelected)="datepicker._selectMonth($event)"
13-
(_userSelection)="datepicker.close()"
14-
[headerComponent]="datepicker.calendarHeaderComponent">
14+
(_userSelection)="datepicker.close()">
1515
</mat-calendar>

0 commit comments

Comments
 (0)