summaryrefslogtreecommitdiff
path: root/datetime/mod.ts
diff options
context:
space:
mode:
authorJames Garbutt <43081j@users.noreply.github.com>2019-01-16 15:25:52 +0000
committerRyan Dahl <ry@tinyclouds.org>2019-01-16 10:25:52 -0500
commit811128864c4db40409c5c5538b56466e4f4e704c (patch)
tree0eb4ea9abcf527f622b34ce9f366397234d2d92f /datetime/mod.ts
parent7cb7b24537cd3771f8d2a02bdae9bffc9c7fcbb8 (diff)
datetime: correct hh:mm formats and add test cases (denoland/deno_std#121)
Original: https://github.com/denoland/deno_std/commit/cc40d3e984993afd5e6cdc4acab71676a278e7af
Diffstat (limited to 'datetime/mod.ts')
-rw-r--r--datetime/mod.ts6
1 files changed, 3 insertions, 3 deletions
diff --git a/datetime/mod.ts b/datetime/mod.ts
index c5e6bf0c4..5a967925d 100644
--- a/datetime/mod.ts
+++ b/datetime/mod.ts
@@ -57,13 +57,13 @@ export function parseDateTime(
const datePattern = /^(\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2})$/;
[, y, m, d, ho, mi] = datePattern.exec(datetimeStr);
} else if (format === "hh:mm mm-dd-yyyy") {
- const datePattern = /^(\d{2})-(\d{2})-(\d{4}) (\d{2}):(\d{2})$/;
+ const datePattern = /^(\d{2}):(\d{2}) (\d{2})-(\d{2})-(\d{4})$/;
[, ho, mi, m, d, y] = datePattern.exec(datetimeStr);
} else if (format === "hh:mm dd-mm-yyyy") {
- const datePattern = /^(\d{2})-(\d{2})-(\d{4}) (\d{2}):(\d{2})$/;
+ const datePattern = /^(\d{2}):(\d{2}) (\d{2})-(\d{2})-(\d{4})$/;
[, ho, mi, d, m, y] = datePattern.exec(datetimeStr);
} else if (format === "hh:mm yyyy-mm-dd") {
- const datePattern = /^(\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2})$/;
+ const datePattern = /^(\d{2}):(\d{2}) (\d{4})-(\d{2})-(\d{2})$/;
[, ho, mi, y, m, d] = datePattern.exec(datetimeStr);
} else {
throw new Error("Invalid datetime format!");