grouping declarations together

master
Matt Huntington 8 years ago
parent b4463daead
commit a4de1cb987

@ -86,19 +86,25 @@ var zoomCallback = function(){
d3.select('#y-axis').call(leftAxis.scale(d3.event.transform.rescaleY(yScale))); d3.select('#y-axis').call(leftAxis.scale(d3.event.transform.rescaleY(yScale)));
} }
var xScale = d3.scaleTime();
var parseTime = d3.timeParse("%B%e, %Y at %-I:%M%p");
var yScale = d3.scaleLinear();
var bottomAxis = d3.axisBottom(xScale);
var leftAxis = d3.axisLeft(yScale);
var formatTime = d3.timeFormat("%B%e, %Y at %-I:%M%p");
var lastTransform = null;
var zoom = d3.zoom().on('zoom', zoomCallback);
d3.select('#container') d3.select('#container')
.style('width', WIDTH) .style('width', WIDTH)
.style('height', HEIGHT); .style('height', HEIGHT);
var xScale = d3.scaleTime();
var parseTime = d3.timeParse("%B%e, %Y at %-I:%M%p");
xScale.range([0,WIDTH]); xScale.range([0,WIDTH]);
xDomain = d3.extent(runs, function(datum, index){ xDomain = d3.extent(runs, function(datum, index){
return parseTime(datum.date); return parseTime(datum.date);
}); });
xScale.domain(xDomain); xScale.domain(xDomain);
var yScale = d3.scaleLinear();
yScale.range([HEIGHT, 0]); yScale.range([HEIGHT, 0]);
yDomain = d3.extent(runs, function(datum, index){ yDomain = d3.extent(runs, function(datum, index){
return datum.distance; return datum.distance;
@ -106,14 +112,12 @@ yDomain = d3.extent(runs, function(datum, index){
yScale.domain(yDomain); yScale.domain(yDomain);
render(); render();
var bottomAxis = d3.axisBottom(xScale);
d3.select('#container') d3.select('#container')
.append('g') .append('g')
.attr('id', 'x-axis') .attr('id', 'x-axis')
.call(bottomAxis) .call(bottomAxis)
.attr('transform', 'translate(0,'+HEIGHT+')'); .attr('transform', 'translate(0,'+HEIGHT+')');
var leftAxis = d3.axisLeft(yScale);
d3.select('#container') d3.select('#container')
.append('g') .append('g')
.attr('id', 'y-axis') .attr('id', 'y-axis')
@ -121,7 +125,6 @@ d3.select('#container')
createTable(); createTable();
var formatTime = d3.timeFormat("%B%e, %Y at %-I:%M%p");
d3.select('#container').on('click', function(){ d3.select('#container').on('click', function(){
var x = d3.event.offsetX; var x = d3.event.offsetX;
var y = d3.event.offsetY; var y = d3.event.offsetY;
@ -144,6 +147,4 @@ d3.select('#container').on('click', function(){
render(); render();
}); });
var lastTransform = null;
var zoom = d3.zoom().on('zoom', zoomCallback);
d3.select('#container').call(zoom); d3.select('#container').call(zoom);

Loading…
Cancel
Save