Skip to content

Commit 23936f9

Browse files
DaveWMAntoine Pairet
authored andcommitted
fix(datepicker): date formatting when using angular 1.3 fixes angular-ui#2659
Closes angular-ui#3293 Closes angular-ui#3279 Closes angular-ui#2440 Closes angular-ui#2932 Closes angular-ui#3074 Closes angular-ui#2943 Closes angular-ui#2733 Fixes angular-ui#3047 Fixes angular-ui#2659 Fixes angular-ui#2681
1 parent ed5013b commit 23936f9

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

src/datepicker/datepicker.js

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -524,6 +524,10 @@ function ($compile, $parse, $document, $position, dateFilter, dateParser, datepi
524524
}
525525
ngModel.$parsers.unshift(parseDate);
526526

527+
ngModel.$formatters.push(function (value) {
528+
return ngModel.$isEmpty(value) ? value : dateFilter(value, dateFormat);
529+
});
530+
527531
// Inner change
528532
scope.dateSelection = function(dt) {
529533
if (angular.isDefined(dt)) {
@@ -544,9 +548,9 @@ function ($compile, $parse, $document, $position, dateFilter, dateParser, datepi
544548
});
545549
});
546550

547-
// Outter change
551+
// Outer change
548552
ngModel.$render = function() {
549-
var date = ngModel.$viewValue ? dateFilter(ngModel.$viewValue, dateFormat) : '';
553+
var date = ngModel.$viewValue ? dateFilter(parseDate(ngModel.$viewValue), dateFormat) : '';
550554
element.val(date);
551555
scope.date = parseDate( ngModel.$modelValue );
552556
};

0 commit comments

Comments
 (0)