Skip to content
This repository was archived by the owner on May 29, 2019. It is now read-only.

Commit ca31ddc

Browse files
committed
fix(datepicker): fix today button disabled condition
- Fix conditional for today button in popup
1 parent 8747b58 commit ca31ddc

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

Diff for: src/datepicker/datepicker.js

+6-3
Original file line numberDiff line numberDiff line change
@@ -1013,11 +1013,14 @@ function($scope, $element, $attrs, $compile, $log, $parse, $window, $document, $
10131013

10141014
$scope.isDisabled = function(date) {
10151015
if (date === 'today') {
1016-
date = new Date();
1016+
date = dateParser.fromTimezone(new Date(), ngModelOptions.timezone);
10171017
}
10181018

1019-
return $scope.watchData.minDate && $scope.compare(date, cache.minDate) < 0 ||
1020-
$scope.watchData.maxDate && $scope.compare(date, cache.maxDate) > 0;
1019+
return $scope.datepickerOptions &&
1020+
($scope.datepickerOptions.minDate && $scope.compare(date, $scope.datepickerOptions.minDate) < 0) ||
1021+
$scope.datepickerOptions.maxDate && $scope.compare(date, $scope.datepickerOptions.maxDate) > 0 ||
1022+
$scope.watchData.minDate && $scope.compare(date, cache.minDate) < 0 ||
1023+
$scope.watchData.maxDate && $scope.compare(date, cache.maxDate) > 0;
10211024
};
10221025

10231026
$scope.compare = function(date1, date2) {

0 commit comments

Comments
 (0)