Hopiu/angular.js
1
0
Fork 0
mirror of https://github.com/Hopiu/angular.js.git synced 2026-05-09 07:14:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(date filter): default to fullDate format

Browse source 
The browser's behave inconsistently, so we should just stick to one format
when the format is not specified by the developer

Closes #605
This commit is contained in:
Igor Minar 2011-10-18 23:42:36 -07:00
parent f38010d3a2
commit e175db37c6
2 changed files with 27 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
src/filters.js
View file

@ -318,7 +318,7 @@ var GET_TIME_ZONE = /[A-Z]{3}(?![+\-])/,
* @param {(Date|number|string)} date Date to format either as Date object, milliseconds (string or * @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). * number) or ISO 8601 extended datetime string (yyyy-MM-ddTHH:mm:ss.SSSZ).
* @param {string=} format Formatting rules (see Description). If not specified, * @param {string=} format Formatting rules (see Description). If not specified,
* Date#toLocaleDateString is used. * `fullDate` is used.
* @returns {string} Formatted string or the input if input is not recognized as date/millis. * @returns {string} Formatted string or the input if input is not recognized as date/millis.
* *
* @example * @example
@ -344,7 +344,12 @@ var GET_TIME_ZONE = /[A-Z]{3}(?![+\-])/,
</doc:example> </doc:example>
*/ */
angularFilter.date = function(date, format) { angularFilter.date = function(date, format) {
var $locale = this.$service('$locale'); var $locale = this.$service('$locale'),
text = '',
parts = [],
fn, match;
format = format || 'fullDate'
format = $locale.DATETIME_FORMATS[format] || format; format = $locale.DATETIME_FORMATS[format] || format;
if (isString(date)) { if (isString(date)) {
if (NUMBER_STRING.test(date)) { if (NUMBER_STRING.test(date)) {
@ -362,26 +367,23 @@ angularFilter.date = function(date, format) {
return date; return date;
} }
var text = date.toLocaleDateString(), fn; while(format) {
if (format && isString(format)) { match = DATE_FORMATS_SPLIT.exec(format);
text = ''; if (match) {
var parts = [], match; parts = concat(parts, match, 1);
while(format) { format = parts.pop();
match = DATE_FORMATS_SPLIT.exec(format); } else {
if (match) { parts.push(format);
parts = concat(parts, match, 1); format = null;
format = parts.pop();
} else {
parts.push(format);
format = null;
}
} }
forEach(parts, function(value){
fn = DATE_FORMATS[value];
text += fn ? fn(date, $locale.DATETIME_FORMATS)
: value.replace(/(^'|'$)/g, '').replace(/''/g, "'");
});
} }
forEach(parts, function(value){
fn = DATE_FORMATS[value];
text += fn ? fn(date, $locale.DATETIME_FORMATS)
: value.replace(/(^'|'$)/g, '').replace(/''/g, "'");
});
return text; return text;
}; };

10
test/FiltersSpec.js
View file

@ -225,13 +225,13 @@ describe('filter', function() {
}); });
it('should do basic filter', function() { it('should do basic filter', function() {
expect(date(noon)).toEqual(noon.toLocaleDateString()); expect(date(noon)).toEqual(date(noon, 'fullDate'));
expect(date(noon, '')).toEqual(noon.toLocaleDateString()); expect(date(noon, '')).toEqual(date(noon, 'fullDate'));
}); });
it('should accept number or number string representing milliseconds as input', function() { it('should accept number or number string representing milliseconds as input', function() {
expect(date(noon.getTime())).toEqual(noon.toLocaleDateString()); expect(date(noon.getTime())).toEqual(date(noon.getTime(), 'fullDate'));
expect(date(noon.getTime() + "")).toEqual(noon.toLocaleDateString()); expect(date(noon.getTime() + "")).toEqual(date(noon.getTime() + "", 'fullDate'));
}); });
it('should accept various format strings', function() { it('should accept various format strings', function() {
@ -297,7 +297,7 @@ describe('filter', function() {
it('should be able to parse ISO 8601 dates/times using', function() { it('should be able to parse ISO 8601 dates/times using', function() {
var isoString = '2010-09-03T05:05:08.872Z'; var isoString = '2010-09-03T05:05:08.872Z';
expect(date(isoString)). expect(date(isoString)).
toEqual(angular.String.toDate(isoString).toLocaleDateString()); toEqual(date(isoString, 'fullDate'));
}); });
it('should parse format ending with non-replaced string', function() { it('should parse format ending with non-replaced string', function() {