diff options
Diffstat (limited to 'src/filters.js')
| -rw-r--r-- | src/filters.js | 69 |
1 files changed, 59 insertions, 10 deletions
diff --git a/src/filters.js b/src/filters.js index 1dd6322b..8fac671d 100644 --- a/src/filters.js +++ b/src/filters.js @@ -184,6 +184,17 @@ function dateStrGetter(name, shortForm) { }; } +function timeZoneGetter(numFormat) { + return function(date) { + var timeZone; + if (numFormat || !(timeZone = GET_TIME_ZONE.exec(date.toString()))) { + var offset = date.getTimezoneOffset(); + return padNumber(offset / 60, 2) + padNumber(Math.abs(offset % 60), 2); + } + return timeZone[0]; + }; +} + var DAY = 'Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday'.split(','); var MONTH = 'January,February,March,April,May,June,July,August,September,October,November,December'. @@ -192,7 +203,8 @@ var MONTH = 'January,February,March,April,May,June,July,August,September,October var DATE_FORMATS = { yyyy: dateGetter('FullYear', 4), yy: dateGetter('FullYear', 2, 0, true), - MMMMM: dateStrGetter('Month'), + y: dateGetter('FullYear', 1), + MMMM: dateStrGetter('Month'), MMM: dateStrGetter('Month', true), MM: dateGetter('Month', 2, 1), M: dateGetter('Month', 1, 1), @@ -209,14 +221,26 @@ var DATE_FORMATS = { EEEE: dateStrGetter('Day'), EEE: dateStrGetter('Day', true), a: function(date){return date.getHours() < 12 ? 'am' : 'pm';}, - Z: function(date){ - var offset = date.getTimezoneOffset(); - return padNumber(offset / 60, 2) + padNumber(Math.abs(offset % 60), 2); - } + z: timeZoneGetter(false), + Z: timeZoneGetter(true) }; +var DEFAULT_DATETIME_FORMATS = { + long: 'MMMM d, y h:mm:ss a z', + medium: 'MMM d, y h:mm:ss a', + short: 'M/d/yy h:mm a', + fullDate: 'EEEE, MMMM d, y', + longDate: 'MMMM d, y', + mediumDate: 'MMM d, y', + shortDate: 'M/d/yy', + longTime: 'h:mm:ss a z', + mediumTime: 'h:mm:ss a', + shortTime: 'h:mm a' +}; -var DATE_FORMATS_SPLIT = /([^yMdHhmsaZE]*)(E+|y+|M+|d+|H+|h+|m+|s+|a|Z)(.*)/; +var GET_TIME_ZONE = /[A-Z]{3}(?![+\-])/; +var DATE_FORMATS_SPLIT = /([^yMdHhmsazZE]*)(E+|y+|M+|d+|H+|h+|m+|s+|a|Z|z)(.*)/; +var OPERA_TOSTRING_PATTERN = /^[\d].*Z$/; var NUMBER_STRING = /^\d+$/; @@ -231,9 +255,10 @@ var NUMBER_STRING = /^\d+$/; * * `format` string can be composed of the following elements: * - * * `'yyyy'`: 4 digit representation of year e.g. 2010 - * * `'yy'`: 2 digit representation of year, padded (00-99) - * * `'MMMMM'`: Month in year (January‒December) + * * `'yyyy'`: 4 digit representation of year (e.g. AD 1 => 0001, AD 2010 => 2010) + * * `'yy'`: 2 digit representation of year, padded (00-99). (e.g. AD 2001 => 01, AD 2010 => 10) + * * `'y'`: 1 digit representation of year, e.g. (AD 1 => 1, AD 199 => 199) + * * `'MMMM'`: Month in year (January‒December) * * `'MMM'`: Month in year (Jan - Dec) * * `'MM'`: Month in year, padded (01‒12) * * `'M'`: Month in year (1‒12) @@ -251,15 +276,36 @@ var NUMBER_STRING = /^\d+$/; * * `'s'`: Second in minute (0‒59) * * `'a'`: am/pm marker * * `'Z'`: 4 digit (+sign) representation of the timezone offset (-1200‒1200) + * * `'z'`: short form of current timezone name (e.g. PDT) + * + * `format` string can also be the following default formats for `en_US` locale (support for other + * locales will be added in the future versions): + * + * * `'long'`: equivalent to `'MMMM d, y h:mm:ss a z'` for en_US locale + * (e.g. September 3, 2010 12:05:08 pm PDT) + * * `'medium'`: equivalent to `'MMM d, y h:mm:ss a'` for en_US locale + * (e.g. Sep 3, 2010 12:05:08 pm) + * * `'short'`: equivalent to `'M/d/yy h:mm a'` for en_US locale (e.g. 9/3/10 12:05 pm) + * * `'fullDate'`: equivalent to `'EEEE, MMMM d,y'` for en_US locale + * (e.g. Friday, September 3, 2010) + * * `'longDate'`: equivalent to `'MMMM d, y'` for en_US locale (e.g. September 3, 2010 + * * `'mediumDate'`: equivalent to `'MMM d, y'` for en_US locale (e.g. Sep 3, 2010) + * * `'shortDate'`: equivalent to `'M/d/yy'` for en_US locale (e.g. 9/3/10) + * * `'longTime'`: equivalent to `'h:mm:ss a z'` for en_US locale (e.g. 12:05:08 pm PDT) + * * `'mediumTime'`: equivalent to `'h:mm:ss a'` for en_US locale (e.g. 12:05:08 pm) + * * `'shortTime'`: equivalent to `'h:mm a'` for en_US locale (e.g. 12:05 pm) * * @param {(Date|number|string)} date Date to format either as Date object, milliseconds (string or * number) or ISO 8601 extended datetime string (yyyy-MM-ddTHH:mm:ss.SSSZ). - * @param {string=} format Formatting rules. If not specified, Date#toLocaleDateString is used. + * @param {string=} format Formatting rules (see Description). If not specified, + * Date#toLocaleDateString is used. * @returns {string} Formatted string or the input if input is not recognized as date/millis. * * @example <doc:example> <doc:source> + <span ng:non-bindable>{{1288323623006 | date:'medium'}}</span>: + {{1288323623006 | date:'medium'}}<br/> <span ng:non-bindable>{{1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'}}</span>: {{1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'}}<br/> <span ng:non-bindable>{{1288323623006 | date:'MM/dd/yyyy @ h:mma'}}</span>: @@ -267,6 +313,8 @@ var NUMBER_STRING = /^\d+$/; </doc:source> <doc:scenario> it('should format date', function(){ + expect(binding("1288323623006 | date:'medium'")). + toMatch(/Oct 2\d, 2010 \d{1,2}:\d{2}:\d{2} pm/); expect(binding("1288323623006 | date:'yyyy-MM-dd HH:mm:ss Z'")). toMatch(/2010\-10\-2\d \d{2}:\d{2}:\d{2} \-?\d{4}/); expect(binding("'1288323623006' | date:'MM/dd/yyyy @ h:mma'")). @@ -276,6 +324,7 @@ var NUMBER_STRING = /^\d+$/; </doc:example> */ angularFilter.date = function(date, format) { + format = DEFAULT_DATETIME_FORMATS[format] || format; if (isString(date)) { if (NUMBER_STRING.test(date)) { date = parseInt(date, 10); |