Skip to content
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

Jump to bottom

fix add/subscribe year from date #3147

Closed
wants to merge 1 commit into from
Closed

fix add/subscribe year from date #3147

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/datepicker/ngb-calendar.spec.ts
View file
Open in desktop
Expand Up @@ -55,13 +55,13 @@ describe('ngb-calendar-gregorian', () => {
});

it('should add years to date', () => {
expect(calendar.getNext(new NgbDate(2016, 1, 22), 'y')).toEqual(new NgbDate(2017, 1, 1));
expect(calendar.getNext(new NgbDate(2017, 12, 22), 'y')).toEqual(new NgbDate(2018, 1, 1));
expect(calendar.getNext(new NgbDate(2016, 1, 22), 'y')).toEqual(new NgbDate(2017, 1, 22));
expect(calendar.getNext(new NgbDate(2017, 12, 22), 'y')).toEqual(new NgbDate(2018, 12, 22));
});

it('should subtract years from date', () => {
expect(calendar.getPrev(new NgbDate(2016, 12, 22), 'y')).toEqual(new NgbDate(2015, 1, 1));
expect(calendar.getPrev(new NgbDate(2017, 1, 22), 'y')).toEqual(new NgbDate(2016, 1, 1));
expect(calendar.getPrev(new NgbDate(2016, 12, 22), 'y')).toEqual(new NgbDate(2015, 12, 22));
expect(calendar.getPrev(new NgbDate(2017, 1, 22), 'y')).toEqual(new NgbDate(2016, 1, 22));
});

it('should properly recognize invalid javascript date', () => {
Expand Down
2 changes: 1 addition & 1 deletion src/datepicker/ngb-calendar.ts
View file
Open in desktop
Expand Up @@ -101,7 +101,7 @@ export class NgbCalendarGregorian extends NgbCalendar {

switch (period) {
case 'y':
return new NgbDate(date.year + number, 1, 1);
return new NgbDate(date.year + number, date.month, date.year);
case 'm':
jsDate = new Date(date.year, date.month + number - 1, 1, 12);
break;
Expand Down