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

date filter should accept ISO 8601 formatted string as input

Browse source 
Closes #125
This commit is contained in:
Igor Minar 2010-11-06 23:40:44 -07:00
parent f077649f48
commit a397645537
3 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG.md
View file

@ -1,5 +1,8 @@
# <angular/> 0.9.3 cold-resistance (in-progress) # # <angular/> 0.9.3 cold-resistance (in-progress) #
### Api
- date filter now accepts strings that angular.String.toDate can convert to Date objects
# <angular/> 0.9.2 faunal-mimicry (2010-11-03) # # <angular/> 0.9.2 faunal-mimicry (2010-11-03) #

11
src/filters.js
View file

@ -168,7 +168,8 @@ var NUMBER_STRING = /^\d+$/;
* * `'a'`: am/pm marker * * `'a'`: am/pm marker
* * `'Z'`: 4 digit (+sign) representation of the timezone offset (-1200‒1200) * * `'Z'`: 4 digit (+sign) representation of the timezone offset (-1200‒1200)
* *
* @param {(Date|number|string)} date Date to format either as Date object or milliseconds. * @param {(Date|number|string)} date Date to format either as Date object, milliseconds (string or
* number) or ISO 8601 string (yyyy-MM-ddTHH:mm:ssZ).
* @param {string=} format Formatting rules. If not specified, Date#toLocaleDateString is used. * @param {string=} format Formatting rules. If not specified, Date#toLocaleDateString 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.
* *
@ -188,8 +189,12 @@ var NUMBER_STRING = /^\d+$/;
* *
*/ */
angularFilter.date = function(date, format) { angularFilter.date = function(date, format) {
if (isString(date) && NUMBER_STRING.test(date)) { if (isString(date)) {
date = parseInt(date, 10); if (NUMBER_STRING.test(date)) {
date = parseInt(date, 10);
} else {
date = angularString.toDate(date);
}
} }
if (isNumber(date)) { if (isNumber(date)) {

6
test/FiltersSpec.js
View file

@ -128,5 +128,11 @@ describe('filter', function(){
expect(filter.date(noon, "yyyy-MM-dd hh=HH:mm:ssaZ")). expect(filter.date(noon, "yyyy-MM-dd hh=HH:mm:ssaZ")).
toEqual('2010-09-03 12=12:05:08pm0500'); toEqual('2010-09-03 12=12:05:08pm0500');
}); });
it('should be able to parse ISO 8601 dates/times using', function() {
var isoString = '2010-09-03T05:05:08Z';
expect(filter.date(isoString)).
toEqual(angular.String.toDate(isoString).toLocaleDateString());
});
}); });
}); });