Skip to content

Commit

Permalink
Don't override custom domain set on x/yScale option
Browse files Browse the repository at this point in the history
  • Loading branch information
theefer committed Feb 24, 2014
1 parent 6f1d446 commit b51bd61
Showing 1 changed file with 16 additions and 2 deletions.
18 changes: 16 additions & 2 deletions rickshaw.js
Expand Up @@ -486,14 +486,28 @@ Rickshaw.Graph = function(args) {

var domain = this.renderer.domain();

this.x = (this.xScale || d3.scale.linear()).domain(domain.x).range([0, this.width]);
this.y = (this.yScale || d3.scale.linear()).domain(domain.y).range([this.height, 0]);
var xScale = this.xScale || d3.scale.linear();
// Set domain unless already set
if (isDefaultDomain(xScale.domain())) {
xScale = xScale.domain(domain.x);
}
this.x = xScale.range([0, this.width]);

var yScale = this.yScale || d3.scale.linear();
if (isDefaultDomain(yScale.domain())) {
yScale = yScale.domain(domain.y);
}
this.y = yScale.range([this.height, 0]);

this.y.magnitude = d3.scale.linear()
.domain([domain.y[0] - domain.y[0], domain.y[1] - domain.y[0]])
.range([0, this.height]);
};

function isDefaultDomain(domain) {
return domain[0] === 0 && domain[1] === 1;
}

this.render = function() {

var stackedData = this.stackData();
Expand Down

0 comments on commit b51bd61

Please sign in to comment.