From 941e02f459fff9de48b6b3b8a8de80bf885d0767 Mon Sep 17 00:00:00 2001 From: Martin Nuc Date: Tue, 29 Mar 2016 20:14:33 +0200 Subject: [PATCH 1/2] Fixed undefined reference when using regex --- src/factory.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/factory.js b/src/factory.js index f1b8b90..4442428 100644 --- a/src/factory.js +++ b/src/factory.js @@ -557,7 +557,7 @@ angular.module("datetime").factory("datetime", function($locale){ break; case "regex": - m = p.regex.exec(text.substr(pos)); + m = node.token.regex.exec(text.substr(pos)); if (!m || m.index != 0) { throw { code: "REGEX_MISMATCH", From fbad00c0f33ee1b95a495c1935b4eb6b88af18b7 Mon Sep 17 00:00:00 2001 From: Martin Nuc Date: Tue, 29 Mar 2016 20:15:18 +0200 Subject: [PATCH 2/2] Added : to the timezone offset Based on https://www.ietf.org/rfc/rfc3339.txt there is no such format without : sign --- src/factory.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/factory.js b/src/factory.js index 4442428..463e9ed 100644 --- a/src/factory.js +++ b/src/factory.js @@ -182,7 +182,7 @@ angular.module("datetime").factory("datetime", function($locale){ "Z": { name: "timezone", type: "regex", - regex: /[+-]\d{4}/ + regex: /[+-]\d{2}:?\d{2}/ }, "string": { name: "string", @@ -337,7 +337,7 @@ angular.module("datetime").factory("datetime", function($locale){ node.value = getWeek(date); break; case "timezone": - node.value = (date.getTimezoneOffset() > 0 ? "-" : "+") + num2str(Math.abs(date.getTimezoneOffset() / 60), 2, 2) + "00"; + node.value = (date.getTimezoneOffset() > 0 ? "-" : "+") + num2str(Math.abs(date.getTimezoneOffset() / 60), 2, 2) + ":00"; break; }