kylefang/angular.js
1
0
Fork 0
mirror of https://github.com/zhigang1992/angular.js.git synced 2026-04-15 22:34:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed date formater and make it work on ie

Browse Source
This commit is contained in:
Misko Hevery
2010-10-16 21:36:49 -07:00
parent f8865459d5
commit b96f736951
2 changed files with 48 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
test/FiltersSpec.js
View File

@@ -87,21 +87,34 @@ describe('filter', function(){
});
describe('date', function(){
var date = angular.String.toDate('2010-10-13T14:45:23Z');
var morning = angular.String.toDate('2010-09-03T23:05:08Z');
var midnight = angular.String.toDate('2010-09-03T23:05:08Z');
var noon = angular.String.toDate('2010-09-03T23:05:08Z');
morning.setHours(7);
noon.setHours(12);
midnight.setHours(0);
//butt-ugly hack: force the date to be 2pm PDT for locale testing
date.setHours(14);
date.getTimezoneOffset = function() { return 7 * 60; };
morning.getTimezoneOffset =
noon.getTimezoneOffset =
midnight.getTimezoneOffset =
function() { return 7 * 60; };
it('should do basic filter', function() {
expect(filter.date(date)).toEqual(date.toLocaleDateString());
expect(filter.date(date, '')).toEqual(date.toLocaleDateString());
expect(filter.date(noon)).toEqual(noon.toLocaleDateString());
expect(filter.date(noon, '')).toEqual(noon.toLocaleDateString());
});
it('should accept format', function() {
expect(filter.date(date, "yyyy-MM-dd HH:mm:ss")).toEqual('2010-10-13 14:45:23');
expect(filter.date(date, "yy-MM-dd KK:mm:ssaZ")).toEqual('10-10-13 02:45:23pm0700');
expect(filter.date(midnight, "yyyy-M-d h=H:m:saZ")).
toEqual('2010-9-3 12=0:5:8am0700');
expect(filter.date(midnight, "yyyy-MM-dd hh=HH:mm:ssaZ")).
toEqual('2010-09-03 12=00:05:08am0700');
expect(filter.date(noon, "yyyy-MM-dd hh=HH:mm:ssaZ")).
toEqual('2010-09-03 12=12:05:08pm0700');
});