Skip to content

fixes format filter when invalid date. #311

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixes format filter when invalid date. #311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion app/scripts/datePicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ Module.constant('datePickerConfig', {
Module.filter('mFormat', function () {
return function (m, format, tz) {
if (!(moment.isMoment(m))) {
return moment(m).format(format);
var value = moment(m);
return value.isValid() ? value.format(format) : null;
}
return tz ? moment.tz(m, tz).format(format) : m.format(format);
};
Expand Down
3 changes: 2 additions & 1 deletion dist/angular-datepicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ var Module = angular.module('datePicker', []);
Module.filter('mFormat', function () {
return function (m, format, tz) {
if (!(moment.isMoment(m))) {
return (m) ? moment(m).format(format) : '';
var value = moment(m);
return value.isValid() ? value.format(format) : null;
}
return tz ? moment.tz(m, tz).format(format) : m.format(format);
};
Expand Down
14 changes: 14 additions & 0 deletions test/spec/datePickerTest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,20 @@ describe('Test date Picker Filter', function(){

expect(formattedDate).toBe('2015_01_02');
});

it('returns null when receiving an invalid date', function() {
var date = 'an invalid date';
var formattedDate = mFormatFilter(date, 'YYYY_MM_DD');

expect(formattedDate).toBe(null);
});

it('returns null when receiving null', function() {
var date = null;
var formattedDate = mFormatFilter(date, 'YYYY_MM_DD');

expect(formattedDate).toBe(null);
});
});

describe('Test date Picker Directive', function(){
Expand Down