Skip to content

Commit 83c6f20

Browse files
mbostockmbostock
committed
Merge branch 'master' of https://github.com/bdon/d3 into 2.9.3
2 parents bc9ac2d + 3594c39 commit 83c6f20

4 files changed

Lines changed: 6 additions & 3 deletions

File tree

‎d3.v2.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9037,7 +9037,8 @@ function d3_time_formatIsoNative(date) {
90379037
}
90389038

90399039
d3_time_formatIsoNative.parse = function(string) {
9040-
return new Date(string);
9040+
var date = new Date(string);
9041+
return isNaN(date) ? null : date;
90419042
};
90429043

90439044
d3_time_formatIsoNative.toString = d3_time_formatIso.toString;

‎d3.v2.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/time/format-iso.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ function d3_time_formatIsoNative(date) {
77
}
88

99
d3_time_formatIsoNative.parse = function(string) {
10-
return new Date(string);
10+
var date = new Date(string);
11+
return isNaN(date) ? null : date;
1112
};
1213

1314
d3_time_formatIsoNative.toString = d3_time_formatIso.toString;

‎test/time/format-test.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,7 @@ suite.addBatch({
461461
var p = format.parse;
462462
assert.deepEqual(p("1990-01-01T00:00:00.000Z"), utc(1990, 0, 1, 0, 0, 0));
463463
assert.deepEqual(p("2011-12-31T23:59:59.000Z"), utc(2011, 11, 31, 23, 59, 59));
464+
assert.isNull(p("1990-01-01T00:00:00.000X"));
464465
}
465466
}
466467
}

0 commit comments

Comments
 (0)