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

Add millisecond support for date filter

Browse source 
Date filter should translate input which is a number (or number
string) into a date.
This commit is contained in:
Igor Minar 2010-10-23 18:44:32 -07:00
parent 4e9a2aa10e
commit 841013a4c4
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/filters.js
View file

@ -73,9 +73,19 @@ var DATE_FORMATS = {
} }
}; };
var DATE_FORMATS_SPLIT = /([^yMdHhmsaZ]*)(y+|M+|d+|H+|h+|m+|s+|a|Z)(.*)/; var DATE_FORMATS_SPLIT = /([^yMdHhmsaZ]*)(y+|M+|d+|H+|h+|m+|s+|a|Z)(.*)/;
var NUMBER_STRING = /^\d+$/;
angularFilter.date = function(date, format) { angularFilter.date = function(date, format) {
if (!(date instanceof Date)) return date; if (isString(date) && NUMBER_STRING.test(date)) {
date = parseInt(date, 10);
}
if (isNumber(date)) {
date = new Date(date);
} else if (!(date instanceof Date)) {
return date;
}
var text = date.toLocaleDateString(), fn; var text = date.toLocaleDateString(), fn;
if (format && isString(format)) { if (format && isString(format)) {
text = ''; text = '';

10
test/FiltersSpec.js
View file

@ -98,12 +98,11 @@ describe('filter', function(){
morning.getTimezoneOffset = morning.getTimezoneOffset =
noon.getTimezoneOffset = noon.getTimezoneOffset =
midnight.getTimezoneOffset = midnight.getTimezoneOffset =
function() { return 7 * 60; }; function() {return 7 * 60;};
it('should ignore falsy inputs', function() { it('should ignore falsy inputs', function() {
expect(filter.date(null)).toEqual(null); expect(filter.date(null)).toEqual(null);
expect(filter.date('')).toEqual(''); expect(filter.date('')).toEqual('');
expect(filter.date(123)).toEqual(123);
}); });
it('should do basic filter', function() { it('should do basic filter', function() {
@ -111,6 +110,11 @@ describe('filter', function(){
expect(filter.date(noon, '')).toEqual(noon.toLocaleDateString()); expect(filter.date(noon, '')).toEqual(noon.toLocaleDateString());
}); });
it('should accept number or number string representing milliseconds as input', function() {
expect(filter.date(noon.getTime())).toEqual(noon.toLocaleDateString());
expect(filter.date(noon.getTime() + "")).toEqual(noon.toLocaleDateString());
});
it('should accept format', function() { it('should accept format', function() {
expect(filter.date(midnight, "yyyy-M-d h=H:m:saZ")). expect(filter.date(midnight, "yyyy-M-d h=H:m:saZ")).
toEqual('2010-9-3 12=0:5:8am0700'); toEqual('2010-9-3 12=0:5:8am0700');
@ -122,8 +126,6 @@ describe('filter', function(){
toEqual('2010-09-03 12=12:05:08pm0700'); toEqual('2010-09-03 12=12:05:08pm0700');
}); });
}); });
}); });