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

fix(date): parse string input as local time unless TZ is specified

Browse source 
previously we were always parsing the string input as UTC which cased issues like:

{{ '2012-04-01' | date:'d MMM yyyy' }} renders as 31 Mar 2012

BREAKING CHANGE: string input without timezone info is now parsed as local time/date

Closes #847
This commit is contained in:
Igor Minar 2013-01-09 09:47:40 -08:00
parent 037aefae47
commit cc821502bc
2 changed files with 27 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/ng/filter/filters.js
View file

@ -330,18 +330,22 @@ function dateFilter($locale) {
var R_ISO8601_STR = /^(\d{4})-?(\d\d)-?(\d\d)(?:T(\d\d)(?::?(\d\d)(?::?(\d\d)(?:\.(\d+))?)?)?(Z|([+-])(\d\d):?(\d\d))?)?$/; var R_ISO8601_STR = /^(\d{4})-?(\d\d)-?(\d\d)(?:T(\d\d)(?::?(\d\d)(?::?(\d\d)(?:\.(\d+))?)?)?(Z|([+-])(\d\d):?(\d\d))?)?$/;
function jsonStringToDate(string){ // 1 2 3 4 5 6 7 8 9 10 11
function jsonStringToDate(string) {
var match; var match;
if (match = string.match(R_ISO8601_STR)) { if (match = string.match(R_ISO8601_STR)) {
var date = new Date(0), var date = new Date(0),
tzHour = 0, tzHour = 0,
tzMin = 0; tzMin = 0,
dateSetter = match[8] ? date.setUTCFullYear : date.setFullYear,
timeSetter = match[8] ? date.setUTCHours : date.setHours;
if (match[9]) { if (match[9]) {
tzHour = int(match[9] + match[10]); tzHour = int(match[9] + match[10]);
tzMin = int(match[9] + match[11]); tzMin = int(match[9] + match[11]);
} }
date.setUTCFullYear(int(match[1]), int(match[2]) - 1, int(match[3])); dateSetter.call(date, int(match[1]), int(match[2]) - 1, int(match[3]));
date.setUTCHours(int(match[4]||0) - tzHour, int(match[5]||0) - tzMin, int(match[6]||0), int(match[7]||0)); timeSetter.call(date, int(match[4]||0) - tzHour, int(match[5]||0) - tzMin, int(match[6]||0), int(match[7]||0));
return date; return date;
} }
return string; return string;

33
test/ng/filter/filtersSpec.js
View file

@ -253,32 +253,37 @@ describe('filters', function() {
}); });
it('should support various iso8061 date strings as input', function() { it('should support various iso8061 date strings with timezone as input', function() {
var format = 'yyyy-MM ss'; var format = 'yyyy-MM-dd ss';
//full ISO8061 //full ISO8061
expect(date('2003-09-10T13:02:03.000Z', format)).toEqual('2003-09 03'); expect(date('2003-09-10T13:02:03.000Z', format)).toEqual('2003-09-10 03');
expect(date('2003-09-10T13:02:03.000+00:00', format)).toEqual('2003-09 03'); expect(date('2003-09-10T13:02:03.000+00:00', format)).toEqual('2003-09-10 03');
expect(date('2003-09-10T13:02:03-08:00', format)).toEqual('2003-09 03'); expect(date('20030910T033203-0930', format)).toEqual('2003-09-10 03');
expect(date('20030910T033203-0930', format)).toEqual('2003-09 03');
//no timezone
expect(date('2003-09-10T13:02:03.000', format)).toEqual('2003-09 03');
//no millis //no millis
expect(date('2003-09-10T13:02:03Z', format)).toEqual('2003-09 03'); expect(date('2003-09-10T13:02:03Z', format)).toEqual('2003-09-10 03');
//no seconds //no seconds
expect(date('2003-09-10T13:02Z', format)).toEqual('2003-09 00'); expect(date('2003-09-10T13:02Z', format)).toEqual('2003-09-10 00');
//no minutes //no minutes
expect(date('2003-09-10T13Z', format)).toEqual('2003-09 00'); expect(date('2003-09-10T13Z', format)).toEqual('2003-09-10 00');
});
it('should parse iso8061 date strings without timezone as local time', function() {
var format = 'yyyy-MM-dd HH-mm-ss';
//full ISO8061 without timezone
expect(date('2003-09-10T03:02:04.000', format)).toEqual('2003-09-10 03-02-04');
expect(date('20030910T030204', format)).toEqual('2003-09-10 03-02-04');
//no time //no time
expect(date('2003-09-10', format)).toEqual('2003-09 00'); expect(date('2003-09-10', format)).toEqual('2003-09-10 00-00-00');
}); });
it('should support different degrees of subsecond precision', function () { it('should support different degrees of subsecond precision', function () {