diff options
| -rw-r--r-- | src/ng/filter/filters.js | 2 | ||||
| -rw-r--r-- | test/ng/filter/filtersSpec.js | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/ng/filter/filters.js b/src/ng/filter/filters.js index b3792171..376afd85 100644 --- a/src/ng/filter/filters.js +++ b/src/ng/filter/filters.js @@ -320,7 +320,7 @@ dateFilter.$inject = ['$locale']; function dateFilter($locale) { - var R_ISO8601_STR = /^(\d{4})-?(\d\d)-?(\d\d)(?:T(\d\d)(?::?(\d\d)(?::?(\d\d)(?:\.(\d+))?)?)?(Z|([+-])(\d\d):?(\d\d)))?$/; + var R_ISO8601_STR = /^(\d{4})-?(\d\d)-?(\d\d)(?:T(\d\d)(?::?(\d\d)(?::?(\d\d)(?:\.(\d+))?)?)?(Z|([+-])(\d\d):?(\d\d))?)?$/; function jsonStringToDate(string){ var match; if (match = string.match(R_ISO8601_STR)) { diff --git a/test/ng/filter/filtersSpec.js b/test/ng/filter/filtersSpec.js index 9e0a408a..883e91f6 100644 --- a/test/ng/filter/filtersSpec.js +++ b/test/ng/filter/filtersSpec.js @@ -258,6 +258,9 @@ describe('filters', function() { expect(date('20030910T033203-0930', format)).toEqual('2003-09 03'); + //no timezone + expect(date('2003-09-10T13:02:03.000', format)).toEqual('2003-09 03'); + //no millis expect(date('2003-09-10T13:02:03Z', format)).toEqual('2003-09 03'); |