Skip to content
This repository was archived by the owner on Feb 18, 2022. It is now read-only.

Commit 53c88c4

Browse files
authored
Merge pull request #244 from kuzma-sasha/master
Added logic for highlighting current day
2 parents 130d321 + e95e928 commit 53c88c4

File tree

7 files changed

+14
-8
lines changed

7 files changed

+14
-8
lines changed

dist/angular-datepicker.css

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,9 @@ datepicker, .datepicker, [datepicker],
109109
-moz-border-radius: 1px;
110110
border-radius: 1px;
111111
}
112-
._720kb-datepicker-calendar-day:hover,._720kb-datepicker-calendar-day._720kb-datepicker-active {
112+
._720kb-datepicker-calendar-day:hover,
113+
._720kb-datepicker-calendar-day._720kb-datepicker-active,
114+
._720kb-datepicker-calendar-day._720kb-datepicker-today {
113115
background: rgba(0, 0, 0, 0.03);
114116
}
115117
._720kb-datepicker-calendar-header a, ._720kb-datepicker-calendar-header a:hover {

dist/angular-datepicker.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@
110110
'<a href="javascript:void(0)" ng-repeat="px in prevMonthDays" class="_720kb-datepicker-calendar-day _720kb-datepicker-disabled">',
111111
'{{px}}',
112112
'</a>',
113-
'<a href="javascript:void(0)" ng-repeat="item in days" ng-click="setDatepickerDay(item)" ng-class="{\'_720kb-datepicker-active\': selectedDay === item && selectedMonth === monthNumber && selectedYear === year, \'_720kb-datepicker-disabled\': !isSelectableMinDate(year + \'/\' + monthNumber + \'/\' + item ) || !isSelectableMaxDate(year + \'/\' + monthNumber + \'/\' + item) || !isSelectableDate(monthNumber, year, item)}" class="_720kb-datepicker-calendar-day">',
113+
'<a href="javascript:void(0)" ng-repeat="item in days" ng-click="setDatepickerDay(item)" ng-class="{\'_720kb-datepicker-active\': selectedDay === item && selectedMonth === monthNumber && selectedYear === year, \'_720kb-datepicker-disabled\': !isSelectableMinDate(year + \'/\' + monthNumber + \'/\' + item ) || !isSelectableMaxDate(year + \'/\' + monthNumber + \'/\' + item) || !isSelectableDate(monthNumber, year, item),\'_720kb-datepicker-today\': item === today.getDate() && monthNumber === (today.getMonth() + 1) && year === today.getFullYear() && !selectedDay}" class="_720kb-datepicker-calendar-day">',
114114
'{{item}}',
115115
'</a>',
116116
'<a href="javascript:void(0)" ng-repeat="nx in nextMonthDays" class="_720kb-datepicker-calendar-day _720kb-datepicker-disabled">',
@@ -358,6 +358,7 @@
358358

359359
classHelper.add(theCalendar, '_720kb-datepicker-open');
360360
}
361+
$scope.today = new Date();
361362
}
362363
, checkToggle = function checkToggle() {
363364
if (!$scope.datepickerToggle) {

dist/angular-datepicker.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)