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

fix(datepicker): date formatting when using angular 1.3 fixes #2659 #2733

Closed
wants to merge 2 commits into from
Closed

fix(datepicker): date formatting when using angular 1.3 fixes #2659 #2733

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
003d2da
fix(datepicker): date formatting when using angular 1.3 fixes #2659
DaveWM Sep 23, 2014
df50d1f
Merge remote-tracking branch 'upstream/master'
Dec 8, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/datepicker/datepicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,11 @@ function ($compile, $parse, $document, $position, dateFilter, dateParser, datepi
}
}
ngModel.$parsers.unshift(parseDate);


ngModel.$formatters.push(function (value) {
return ngModel.$isEmpty(value) ? value : dateFilter(value, dateFormat);
});

// Inner change
scope.dateSelection = function(dt) {
if (angular.isDefined(dt)) {
Expand All @@ -544,9 +548,9 @@ function ($compile, $parse, $document, $position, dateFilter, dateParser, datepi
});
});

// Outter change
// Outer change
ngModel.$render = function() {
var date = ngModel.$viewValue ? dateFilter(ngModel.$viewValue, dateFormat) : '';
var date = ngModel.$viewValue ? dateFilter(parseDate(ngModel.$viewValue), dateFormat) : '';
element.val(date);
scope.date = parseDate( ngModel.$modelValue );
};
Expand Down