diff options
| author | Maxim Grach | 2013-02-01 11:41:28 +0600 |
|---|---|---|
| committer | Igor Minar | 2013-02-07 02:28:33 -0800 |
| commit | df744f3af46fc227a934f16cb63c7a6038e7133b (patch) | |
| tree | 01ffb1ec1048745c2dbb5f8f66f2c1c5326232ff /src | |
| parent | 8155c3a29ea0eb14806913b8ac08ba7727e1969c (diff) | |
| download | angular.js-df744f3af46fc227a934f16cb63c7a6038e7133b.tar.bz2 | |
feat(dateFilter): add `[.,]sss` formatter for milliseconds
Also Implement getMilliseconds() method of TzDate and
add test for this in ngMock.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ng/filter/filters.js | 4 | ||||
| -rw-r--r-- | src/ngMock/angular-mocks.js | 7 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/ng/filter/filters.js b/src/ng/filter/filters.js index 3459ef88..4680a306 100644 --- a/src/ng/filter/filters.js +++ b/src/ng/filter/filters.js @@ -241,6 +241,9 @@ var DATE_FORMATS = { m: dateGetter('Minutes', 1), ss: dateGetter('Seconds', 2), s: dateGetter('Seconds', 1), + // while ISO 8601 requires fractions to be prefixed with `.` or `,` + // we can be just safely rely on using `sss` since we currently don't support single or two digit fractions + sss: dateGetter('Milliseconds', 3), EEEE: dateStrGetter('Day'), EEE: dateStrGetter('Day', true), a: ampmGetter, @@ -279,6 +282,7 @@ var DATE_FORMATS_SPLIT = /((?:[^yMdHhmsaZE']+)|(?:'(?:[^']|'')*')|(?:E+|y+|M+|d+ * * `'m'`: Minute in hour (0-59) * * `'ss'`: Second in minute, padded (00-59) * * `'s'`: Second in minute (0-59) + * * `'.sss' or ',sss'`: Millisecond in second, padded (000-999) * * `'a'`: am/pm marker * * `'Z'`: 4 digit (+sign) representation of the timezone offset (-1200-1200) * diff --git a/src/ngMock/angular-mocks.js b/src/ngMock/angular-mocks.js index c0b499ef..3bd93a40 100644 --- a/src/ngMock/angular-mocks.js +++ b/src/ngMock/angular-mocks.js @@ -456,6 +456,7 @@ angular.mock.$LogProvider = function() { * newYearInBratislava.getDate() => 1; * newYearInBratislava.getHours() => 0; * newYearInBratislava.getMinutes() => 0; + * newYearInBratislava.getSeconds() => 0; * </pre> * */ @@ -512,6 +513,10 @@ angular.mock.$LogProvider = function() { return self.date.getSeconds(); }; + self.getMilliseconds = function() { + return self.date.getMilliseconds(); + }; + self.getTimezoneOffset = function() { return offset * 60; }; @@ -562,7 +567,7 @@ angular.mock.$LogProvider = function() { } //hide all methods not implemented in this mock that the Date prototype exposes - var unimplementedMethods = ['getMilliseconds', 'getUTCDay', + var unimplementedMethods = ['getUTCDay', 'getYear', 'setDate', 'setFullYear', 'setHours', 'setMilliseconds', 'setMinutes', 'setMonth', 'setSeconds', 'setTime', 'setUTCDate', 'setUTCFullYear', 'setUTCHours', 'setUTCMilliseconds', 'setUTCMinutes', 'setUTCMonth', 'setUTCSeconds', |