Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Week formatter fix in date filter (Comply to ISO8601) #10313

Closed
wants to merge 1 commit into from
Closed

Week formatter fix in date filter (Comply to ISO8601) #10313

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 src/ng/filter/filters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,8 @@ function getFirstThursdayOfYear(year) {
function getThursdayThisWeek(datetime) {
return new Date(datetime.getFullYear(), datetime.getMonth(),
// 4 = index of Thursday
datetime.getDate() + (4 - datetime.getDay()));
//ISO8601 mandates that a week starts on Monday. Making Sunday 7 instead of 0.
datetime.getDate() + 4 - (datetime.getDay() || 7));
}

function weekGetter(size) {
Expand Down
2 changes: 1 addition & 1 deletion test/ng/filter/filtersSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ describe('filters', function() {
var noon = new angular.mock.TzDate(+5, '2010-09-03T17:05:08.012Z'); //12pm
var midnight = new angular.mock.TzDate(+5, '2010-09-03T05:05:08.123Z'); //12am
var earlyDate = new angular.mock.TzDate(+5, '0001-09-03T05:05:08.000Z');
var secondWeek = new angular.mock.TzDate(+5, '2013-01-11T12:00:00.000Z'); //Friday Jan 11, 2012
var secondWeek = new angular.mock.TzDate(+5, '2013-01-13T12:00:00.000Z'); //Sunday Jan 13, 2013
var date;

beforeEach(inject(function($filter) {
Expand Down