Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

fix(date filter): default to fullDate format #607

Merged
merged 2 commits into from
Oct 20, 2011
Merged

fix(date filter): default to fullDate format #607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e175db3
fix(date filter): default to fullDate format
IgorMinar Oct 19, 2011
c6c3949
feat(filter.date): use mediumDate as default
IgorMinar Oct 20, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 22 additions & 20 deletions src/filters.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
* number) or ISO 8601 extended datetime string (yyyy-MM-ddTHH:mm:ss.SSSZ).
* @param {string=} format Formatting rules (see Description). If not specified,
* Date#toLocaleDateString is used.
* `mediumDate` is used.
* @returns {string} Formatted string or the input if input is not recognized as date/millis.
*
* @example
Expand All @@ -344,7 +344,12 @@ var GET_TIME_ZONE = /[A-Z]{3}(?![+\-])/,
</doc:example>
*/
angularFilter.date = function(date, format) {
var $locale = this.$service('$locale');
var $locale = this.$service('$locale'),
text = '',
parts = [],
fn, match;

format = format || 'mediumDate'
format = $locale.DATETIME_FORMATS[format] || format;
if (isString(date)) {
if (NUMBER_STRING.test(date)) {
Expand All @@ -362,26 +367,23 @@ angularFilter.date = function(date, format) {
return date;
}

var text = date.toLocaleDateString(), fn;
if (format && isString(format)) {
text = '';
var parts = [], match;
while(format) {
match = DATE_FORMATS_SPLIT.exec(format);
if (match) {
parts = concat(parts, match, 1);
format = parts.pop();
} else {
parts.push(format);
format = null;
}
while(format) {
match = DATE_FORMATS_SPLIT.exec(format);
if (match) {
parts = concat(parts, match, 1);
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;
};

Expand Down
10 changes: 5 additions & 5 deletions test/FiltersSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,13 +225,13 @@ describe('filter', function() {
});

it('should do basic filter', function() {
expect(date(noon)).toEqual(noon.toLocaleDateString());
expect(date(noon, '')).toEqual(noon.toLocaleDateString());
expect(date(noon)).toEqual(date(noon, 'mediumDate'));
expect(date(noon, '')).toEqual(date(noon, 'mediumDate'));
});

it('should accept number or number string representing milliseconds as input', function() {
expect(date(noon.getTime())).toEqual(noon.toLocaleDateString());
expect(date(noon.getTime() + "")).toEqual(noon.toLocaleDateString());
expect(date(noon.getTime())).toEqual(date(noon.getTime(), 'mediumDate'));
expect(date(noon.getTime() + "")).toEqual(date(noon.getTime() + "", 'mediumDate'));
});

it('should accept various format strings', function() {
Expand Down Expand Up @@ -297,7 +297,7 @@ describe('filter', function() {
it('should be able to parse ISO 8601 dates/times using', function() {
var isoString = '2010-09-03T05:05:08.872Z';
expect(date(isoString)).
toEqual(angular.String.toDate(isoString).toLocaleDateString());
toEqual(date(isoString, 'mediumDate'));
});

it('should parse format ending with non-replaced string', function() {
Expand Down