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

Issue #3307 fix - DatePeeker weeks #3321

Closed
wants to merge 4 commits into from
Closed

Issue #3307 fix - DatePeeker weeks #3321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ca12a32
fixes #3307 - DatePeeker weeks - wrong date sent to "getISO8601WeekNu…
yanivefraim Feb 21, 2015
6c8a657
Issue #3307 fix tests
yanivefraim Feb 21, 2015
baf7987
fix(datepicker): issue #3307 week numbers start over at end of year
yanivefraim Mar 4, 2015
8ebea8c
fix(datepicker): issue #3307 remove trailing whitespace
yanivefraim Mar 4, 2015
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
4 changes: 3 additions & 1 deletion src/datepicker/datepicker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,10 @@ angular.module('ui.bootstrap.datepicker', ['ui.bootstrap.dateparser', 'ui.bootst

if ( scope.showWeeks ) {
scope.weekNumbers = [];
var weekNumber = getISO8601WeekNumber( scope.rows[0][0].date ),
var weekNumber = getISO8601WeekNumber( scope.rows[0][6].date ),
numWeeks = scope.rows.length;
while( scope.weekNumbers.push(weekNumber++) < numWeeks && weekNumber < 53) {}
weekNumber = 1;
while( scope.weekNumbers.push(weekNumber++) < numWeeks ) {}
}
};
Expand Down
2 changes: 1 addition & 1 deletion src/datepicker/test/datepicker.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ describe('datepicker directive', function () {
});

it('renders the week numbers based on ISO 8601', function() {
expect(getWeeks()).toEqual(['34', '35', '36', '37', '38', '39']);
expect(getWeeks()).toEqual(['35', '36', '37', '38', '39', '40']);
});

it('value is correct', function() {
Expand Down