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

Commit ab59413

Browse files
AndriIushchukwesleycho
authored andcommitted
fix(datepicker): check if initDate is valid
Closes #5190 Closes #5266
1 parent 4bb178a commit ab59413

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

Diff for: src/datepicker/datepicker.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -228,10 +228,12 @@ angular.module('ui.bootstrap.datepicker', ['ui.bootstrap.dateparser', 'ui.bootst
228228
$log.warn('uib-datepicker initDate attribute usage is deprecated, use datepicker-options attribute instead');
229229
}
230230

231-
this.activeDate = dateParser.fromTimezone($scope.$parent.$eval($attrs.initDate), ngModelOptions.timezone) || new Date();
231+
var initDate = dateParser.fromTimezone($scope.$parent.$eval($attrs.initDate), ngModelOptions.timezone);
232+
this.activeDate = !isNaN(initDate) ? initDate : new Date();
232233
watchListeners.push($scope.$parent.$watch($attrs.initDate, function(initDate) {
233234
if (initDate && (ngModelCtrl.$isEmpty(ngModelCtrl.$modelValue) || ngModelCtrl.$invalid)) {
234-
self.activeDate = dateParser.fromTimezone(initDate, ngModelOptions.timezone);
235+
initDate = dateParser.fromTimezone(initDate, ngModelOptions.timezone);
236+
self.activeDate = !isNaN(initDate) ? initDate : new Date();
235237
self.refreshView();
236238
}
237239
}));

0 commit comments

Comments
 (0)