Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ dateFormat(now, "N");
| `MM` | Minutes; leading zero for single-digit minutes. |
| `N` | ISO 8601 numeric representation of the day of the week. |
| `o` | GMT/UTC timezone offset, e.g. -0500 or +0230. |
| `p` | GMT/UTC timezone offset, e.g. -05:00 or +02:30. |
| `s` | Seconds; no leading zero for single-digit seconds. |
| `ss` | Seconds; leading zero for single-digit seconds. |
| `S` | The date's ordinal suffix (st, nd, rd, or th). Works well with `d`. |
Expand Down Expand Up @@ -126,7 +127,7 @@ dateFormat(now, "N");
| `longTime` | `h:MM:ss TT Z` | 5:46:21 PM EST |
| `isoDate` | `yyyy-mm-dd` | 2007-06-09 |
| `isoTime` | `HH:MM:ss` | 17:46:21 |
| `isoDateTime` | `yyyy-mm-dd'T'HH:MM:ss` | 2007-06-09T17:46:21 |
| `isoDateTime` | `yyyy-mm-dd'T'HH:MM:sso` | 2007-06-09T17:46:21+0700 |
| `isoUtcDateTime` | `UTC:yyyy-mm-dd'T'HH:MM:ss'Z'` | 2007-06-09T22:46:21Z |

### Localization
Expand Down
10 changes: 9 additions & 1 deletion benchmark/previousDateFormat.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ function _typeof(obj) {
"use strict";

var dateFormat = (function () {
var token = /d{1,4}|m{1,4}|yy(?:yy)?|([HhMsTt])\1?|[LloSZWN]|"[^"]*"|'[^']*'/g;
var token = /d{1,4}|m{1,4}|yy(?:yy)?|([HhMsTt])\1?|[LlopSZWN]|"[^"]*"|'[^']*'/g;
var timezone = /\b(?:[PMCEA][SDP]T|(?:Pacific|Mountain|Central|Eastern|Atlantic) (?:Standard|Daylight|Prevailing) Time|(?:GMT|UTC)(?:[-+]\d{4})?)\b/g;
var timezoneClip = /[^-+\dA-Z]/g; // Regexes and supporting functions are cached through closure

Expand Down Expand Up @@ -224,6 +224,14 @@ function _typeof(obj) {
)
);
},
p: function p() {
return (
(_o() > 0 ? "-" : "+") +
pad(Math.floor(Math.abs(_o()) / 60), 2) +
':' +
pad(Math.floor(Math.abs(_o()) % 60), 2)
);
},
S: function S() {
return ["th", "st", "nd", "rd"][
_d() % 10 > 3 ? 0 : (((_d() % 100) - (_d() % 10) != 10) * _d()) % 10
Expand Down
9 changes: 2 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 6 additions & 1 deletion src/dateformat.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"use strict";

const dateFormat = (() => {
const token = /d{1,4}|m{1,4}|yy(?:yy)?|([HhMsTt])\1?|[LloSZWN]|"[^"]*"|'[^']*'/g;
const token = /d{1,4}|m{1,4}|yy(?:yy)?|([HhMsTt])\1?|[LlopSZWN]|"[^"]*"|'[^']*'/g;
const timezone = /\b(?:[PMCEA][SDP]T|(?:Pacific|Mountain|Central|Eastern|Atlantic) (?:Standard|Daylight|Prevailing) Time|(?:GMT|UTC)(?:[-+]\d{4})?)\b/g;
const timezoneClip = /[^-+\dA-Z]/g;

Expand Down Expand Up @@ -117,6 +117,11 @@
o: () =>
(o() > 0 ? "-" : "+") +
pad(Math.floor(Math.abs(o()) / 60) * 100 + (Math.abs(o()) % 60), 4),
p: () =>
(o() > 0 ? "-" : "+") +
pad(Math.floor(Math.abs(o()) / 60), 2) +
':' +
pad(Math.floor(Math.abs(o()) % 60), 2),
S: () =>
["th", "st", "nd", "rd"][
d() % 10 > 3 ? 0 : (((d() % 100) - (d() % 10) != 10) * d()) % 10
Expand Down
11 changes: 11 additions & 0 deletions test/test_mask-o.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
var assert = require("assert");
var dateFormat = require("../lib/dateformat");

describe("Mask: 'o'", function () {
it("should get timezone for any date as smoething like [+-]XXXX", function (done) {
var date = new Date();
var d = dateFormat(date, "o");
assert.ok(d.match(/^[+-]\d{4}$/), d);
done();
});
});
11 changes: 11 additions & 0 deletions test/test_mask-p.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
var assert = require("assert");
var dateFormat = require("../lib/dateformat");

describe("Mask: 'p'", function () {
it("should get timezone for any date as smoething like [+-]XX:XX", function (done) {
var date = new Date();
var d = dateFormat(date, "p");
assert.ok(d.match(/^[+-]\d{2}:\d{2}$/), d);
done();
});
});