sjs/strftime
1
0
Fork 0
mirror of https://github.com/samsonjs/strftime.git synced 2026-03-25 09:05:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Revert "Fixes #56 (Bug in %U)""

Browse source 
This reverts commit ab3d4a052e.
This commit is contained in:
Alexandr Nikitin 2015-03-29 11:38:17 +03:00
parent 22ddd8982f
commit aee0e19edc
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
strftime.js
View file

@ -595,8 +595,10 @@
else
weekday--;
}
var firstDayOfYear = new Date(date.getFullYear(), 0, 1),
yday = (date - firstDayOfYear) / 86400000,
var firstDayOfYearUtc = Date.UTC(date.getFullYear(), 0, 1),
dateUtc = Date.UTC(date.getFullYear(), date.getMonth(), date.getDate()),
yday = Math.floor((dateUtc - firstDayOfYearUtc) / 86400000),
weekNum = (yday + 7 - weekday) / 7;
return Math.floor(weekNum);

3
test.js
View file

@ -115,6 +115,9 @@ assert.format('%z', null, '+0000');
assert.format('%:z', null, '+00:00');
assert.format('%%', '%'); // any other char
assert.format('%F %T', null, '1970-01-01 00:00:00', new Date(0));
assert.format('%U', '13', "12", (new Date('03-26-2017 00:00:00')));
assert.format('%U', '13', null, (new Date('03-27-2017 00:00:00')));
assert.format('%U', '14', "13", (new Date('04-02-2017 00:00:00')));
ok('GMT');