mirror of
https://github.com/samsonjs/strftime.git
synced 2026-04-27 14:57:37 +00:00
Fixed the pad function.
This commit is contained in:
parent
033126760d
commit
c064afb081
1 changed files with 8 additions and 10 deletions
18
strftime.js
18
strftime.js
|
|
@ -210,7 +210,7 @@
|
||||||
case 'j':
|
case 'j':
|
||||||
var y = new Date(_d.getFullYear(), 0, 1);
|
var y = new Date(_d.getFullYear(), 0, 1);
|
||||||
var day = Math.ceil((_d.getTime() - y.getTime()) / (1000 * 60 * 60 * 24));
|
var day = Math.ceil((_d.getTime() - y.getTime()) / (1000 * 60 * 60 * 24));
|
||||||
return pad(day, 3);
|
return pad(day, null, 3);
|
||||||
|
|
||||||
// ' 0'
|
// ' 0'
|
||||||
case 'k':
|
case 'k':
|
||||||
|
|
@ -218,7 +218,7 @@
|
||||||
|
|
||||||
// '000'
|
// '000'
|
||||||
case 'L':
|
case 'L':
|
||||||
return pad(Math.floor(timestamp % 1000), 3);
|
return pad(Math.floor(timestamp % 1000), null, 3);
|
||||||
|
|
||||||
// '12'
|
// '12'
|
||||||
case 'l':
|
case 'l':
|
||||||
|
|
@ -344,18 +344,16 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
// Default padding is '0' and default length is 2, both are optional.
|
// Default padding is '0' and default length is 2, both are optional.
|
||||||
function pad(n, padding) {
|
function pad(n, padding, length) {
|
||||||
var _padding = padding == null ? '0' : padding;
|
var _padding = padding == null ? '0' : padding;
|
||||||
var _n = String(n);
|
var _n = String(n);
|
||||||
|
var _length = length || 2;
|
||||||
|
|
||||||
// padding may be an empty string, don't loop forever if it is
|
// padding may be an empty string, don't loop forever if it is
|
||||||
switch (_n.length) {
|
if (_padding) {
|
||||||
case 0:
|
while (_n.length < _length) {
|
||||||
_n = _padding + _padding;
|
|
||||||
break;
|
|
||||||
case 1:
|
|
||||||
_n = _padding + _n;
|
_n = _padding + _n;
|
||||||
break;
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return _n;
|
return _n;
|
||||||
|
|
@ -402,7 +400,7 @@
|
||||||
var yDay = (d - firstDayOfYear) / 86400000;
|
var yDay = (d - firstDayOfYear) / 86400000;
|
||||||
|
|
||||||
if (firstWeekday === 'monday') {
|
if (firstWeekday === 'monday') {
|
||||||
if (wDay === 0){
|
if (wDay === 0) {
|
||||||
// Sunday
|
// Sunday
|
||||||
wDay = 6;
|
wDay = 6;
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue