Skip to content

Commit f975142

Browse files
authored
Merge branch 'development' into development
2 parents be0d7c3 + 888bd3d commit f975142

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

.vscode/extensions.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@
22
"recommendations": [
33
"nrwl.angular-console",
44
"angular.ng-template",
5+
"EditorConfig.EditorConfig",
56
"ms-vscode.vscode-typescript-tslint-plugin",
67
"esbenp.prettier-vscode",
78
"firsttris.vscode-jest-runner"
89
]
9-
}
10+
}

src/datepicker/themes/bs/bs-custom-dates-view.component.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ export interface BsCustomDates {
1414
type="button"
1515
class="btn"
1616
(click)="selectFromRanges(range)"
17-
[class.selected]="range.value === selectedRange">
17+
[class.selected]="compareRanges(range)">
1818
{{ range.label }}
1919
</button>
2020
</div>
@@ -32,4 +32,8 @@ export class BsCustomDatesViewComponent {
3232
selectFromRanges(range?: BsCustomDates) {
3333
this.onSelect.emit(range);
3434
}
35+
36+
compareRanges(range?: BsCustomDates) {
37+
return JSON.stringify(range?.value) === JSON.stringify(this.selectedRange);
38+
}
3539
}

0 commit comments

Comments
 (0)