Skip to content

Commit

Permalink
Update plottable.js, plottable.d.ts, and other build artefacts
Browse files Browse the repository at this point in the history
  • Loading branch information
teamdandelion committed Apr 29, 2014
1 parent 72784cc commit 4f5052a
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
1 change: 1 addition & 0 deletions plottable.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -725,6 +725,7 @@ declare module Plottable {
public dataSource(): DataSource;
public dataSource(source: DataSource): Renderer;
public project(attrToSet: string, accessor: any, scale?: Scale): Renderer;
public animate(toggle?: boolean): Renderer;
}
}
declare module Plottable {
Expand Down
10 changes: 9 additions & 1 deletion plottable.js
Original file line number Diff line number Diff line change
Expand Up @@ -1970,6 +1970,14 @@ var Plottable;
this.renderArea = this.content.append("g").classed("render-area", true);
return this;
};

Renderer.prototype.animate = function (toggle) {
if (toggle == null) {
toggle = !this._animate;
}
this._animate = toggle;
return this;
};
Renderer.DEFAULT_COLOR_ACCESSOR = function (d) {
return "#1f77b4";
};
Expand Down Expand Up @@ -2052,7 +2060,7 @@ var Plottable;
this.classed("circle-renderer", true);
this.project("r", 3); // default
this.project("fill", function () {
return "#00ffaa";
return "steelblue";
}); // default
}
CircleRenderer.prototype.project = function (attrToSet, accessor, scale) {
Expand Down
2 changes: 1 addition & 1 deletion test/tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -1771,7 +1771,7 @@ describe("Renderers", function () {
dataset = new Plottable.DataSource(data);

renderer = new Plottable.BarRenderer(dataset, xScale, yScale);
renderer._animate = false;
renderer.animate(false);
renderer.renderTo(svg);
});

Expand Down

0 comments on commit 4f5052a

Please sign in to comment.