Skip to content

Commit 323333d

Browse files
committed
Merge pull request #326 from covin.
Show positive nanosecond for dates prior 1970-01-01.
2 parents 8c2c499 + 5e5d562 commit 323333d

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

src/timezone.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@
250250
, j: function (date) { return Math.floor((date.getTime() - Date.UTC(date.getUTCFullYear(), 0)) / 864e5) + 1 }
251251
, s: function (date) { return Math.floor(date.getTime() / 1000) }
252252
, C: function (date) { return Math.floor(date.getUTCFullYear() / 100) }
253-
, N: function (date) { return date.getTime() % 1000 * 1000000 }
253+
, N: function (date) { return ((date.getTime() % 1000 + 1000) % 1000) * 1000000 }
254254
, m: function (date) { return date.getUTCMonth() + 1 }
255255
, Y: function (date) { return date.getUTCFullYear() }
256256
, y: function (date) { return date.getUTCFullYear() % 100 }

t/format/nanoseconds.t.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
require('proof')(3, prove)
1+
require('proof')(4, prove)
22

33
function prove (assert) {
44
var tz = require('timezone'), util = require('../util')
55
assert(tz(util.y2k, '%N'), '000000000', 'top of hour')
66
assert(tz(util.utc(1980, 0, 1, 0, 0, 1, 999), '%N'), '999000000', 'last millisecond')
77
assert(tz(util.utc(1980, 0, 1, 0, 0, 1, 3), '%N'), '003000000', 'nanoseconds')
8+
assert(tz(util.utc(1969, 0, 1, 0, 0, 1, 42), '%N'), '042000000', 'ns from negative')
89
}

0 commit comments

Comments
 (0)