vhad/DefinitelyTyped
1
0
Fork 0
mirror of https://github.com/gosticks/DefinitelyTyped.git synced 2026-08-12 04:50:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2448 from pelotom/multi-scale-time-formats

Browse Source 
Add multi-scale time format method
This commit is contained in:
Basarat Ali Syed
2014-07-03 12:42:39 +10:00
parent 8c220b0fbf 4e3c8af9e0
commit b7f0c09cdc
2 changed files with 60 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
d3/d3-tests.ts
+38
View File
@@ -2587,4 +2587,42 @@ function extentTest() {
d3.extent(["20", 3], (d) => { return d; });
d3.extent([3, "20"], (d) => { return d; });
d3.extent(["3", 20], (d) => { return d; });
}
// Tests for d3.time.format.multi
// Adopted from http://bl.ocks.org/mbostock/4149176
function multiTest() {
var customTimeFormat = d3.time.format.multi([
[".%L", function(d) { return d.getMilliseconds(); }],
[":%S", function(d) { return d.getSeconds(); }],
["%I:%M", function(d) { return d.getMinutes(); }],
["%I %p", function(d) { return d.getHours(); }],
["%a %d", function(d) { return d.getDay() && d.getDate() != 1; }],
["%b %d", function(d) { return d.getDate() != 1; }],
["%B", function(d) { return d.getMonth(); }],
["%Y", function() { return true; }]
]);
var margin = {top: 250, right: 40, bottom: 250, left: 40},
width = 960 - margin.left - margin.right,
height = 500 - margin.top - margin.bottom;
var x = d3.time.scale()
.domain([new Date(2012, 0, 1), new Date(2013, 0, 1)])
.range([0, width]);
var xAxis = d3.svg.axis()
.scale(x)
.tickFormat(customTimeFormat);
var svg = d3.select("body").append("svg")
.attr("width", width + margin.left + margin.right)
.attr("height", height + margin.top + margin.bottom)
.append("g")
.attr("transform", "translate(" + margin.left + "," + margin.top + ")");
svg.append("g")
.attr("class", "x axis")
.attr("transform", "translate(0," + height + ")")
.call(xAxis);
}
d3/d3.d.ts
Vendored
+22 -2
View File
@@ -1003,9 +1003,29 @@ declare module D3 {
fridays: Range;
saturdays: Range;
format: {
/**
* Constructs a new local time formatter using the given specifier.
*/
(specifier: string): TimeFormat;
utc: (specifier: string) => TimeFormat;
/**
* Returns a new multi-resolution time format given the specified array of predicated formats.
*/
multi: (formats: any[][]) => TimeFormat;
utc: {
/**
* Constructs a new local time formatter using the given specifier.
*/
(specifier: string): TimeFormat;
/**
* Returns a new multi-resolution UTC time format given the specified array of predicated formats.
*/
multi: (formats: any[][]) => TimeFormat;
};
/**
* The full ISO 8601 UTC time format: "%Y-%m-%dT%H:%M:%S.%LZ".
*/
iso: TimeFormat;
};