Skip to content

Commit 1123ae9

Browse files
committed
Merge pull request #3035 from palantir/r2.0.0
Release version 2.0.0 (--> master)
2 parents cd18127 + 94b13e8 commit 1123ae9

7 files changed

Lines changed: 39 additions & 8 deletions

File tree

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "plottable",
33
"description": "A modular charting library built on D3",
4-
"version": "2.0.0-rc2",
4+
"version": "2.0.0",
55
"main": [
66
"plottable.js",
77
"plottable.css"

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "plottable.js",
33
"description": "A modular charting library built on D3",
4-
"version": "2.0.0-rc2",
4+
"version": "2.0.0",
55
"license": "MIT",
66
"repository": {
77
"type": "git",

plottable.d.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3665,6 +3665,8 @@ declare module Plottable.Plots {
36653665
* @constructor
36663666
*/
36673667
constructor();
3668+
croppedRenderingEnabled(): boolean;
3669+
croppedRenderingEnabled(croppedRendering: boolean): this;
36683670
protected _getAnimator(key: string): Animator;
36693671
protected _setup(): void;
36703672
x(): Plots.AccessorScaleBinding<X, number>;

plottable.js

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
Plottable 2.0.0-rc2 (https://github.com/palantir/plottable)
2+
Plottable 2.0.0 (https://github.com/palantir/plottable)
33
Copyright 2014-2015 Palantir Technologies
44
Licensed under MIT (https://github.com/palantir/plottable/blob/master/LICENSE)
55
*/
@@ -885,7 +885,7 @@ var Plottable;
885885
})(Plottable || (Plottable = {}));
886886
var Plottable;
887887
(function (Plottable) {
888-
Plottable.version = "2.0.0-rc2";
888+
Plottable.version = "2.0.0";
889889
})(Plottable || (Plottable = {}));
890890
var Plottable;
891891
(function (Plottable) {
@@ -9328,7 +9328,19 @@ var Plottable;
93289328
this._stackingResult = new Plottable.Utils.Map();
93299329
this._stackedExtent = [];
93309330
this._baselineValueProvider = function () { return [_this._baselineValue]; };
9331+
this.croppedRenderingEnabled(false);
93319332
}
9333+
StackedArea.prototype.croppedRenderingEnabled = function (croppedRendering) {
9334+
if (croppedRendering == null) {
9335+
return _super.prototype.croppedRenderingEnabled.call(this);
9336+
}
9337+
if (croppedRendering === true) {
9338+
// HACKHACK #3032: cropped rendering doesn't currently work correctly on StackedArea
9339+
Plottable.Utils.Window.warn("Warning: Stacked Area Plot does not support cropped rendering.");
9340+
return this;
9341+
}
9342+
return _super.prototype.croppedRenderingEnabled.call(this, croppedRendering);
9343+
};
93329344
StackedArea.prototype._getAnimator = function (key) {
93339345
return new Plottable.Animators.Null();
93349346
};

plottable.min.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

plottable.zip

216 Bytes
Binary file not shown.

src/plots/stackedAreaPlot.ts

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,23 @@ module Plottable.Plots {
1717
this._stackingResult = new Utils.Map<Dataset, Utils.Map<string, Utils.Stacking.StackedDatum>>();
1818
this._stackedExtent = [];
1919
this._baselineValueProvider = () => [this._baselineValue];
20+
this.croppedRenderingEnabled(false);
21+
}
22+
23+
public croppedRenderingEnabled(): boolean;
24+
public croppedRenderingEnabled(croppedRendering: boolean): this;
25+
public croppedRenderingEnabled(croppedRendering?: boolean): any {
26+
if (croppedRendering == null) {
27+
return super.croppedRenderingEnabled();
28+
}
29+
30+
if (croppedRendering === true) {
31+
// HACKHACK #3032: cropped rendering doesn't currently work correctly on StackedArea
32+
Utils.Window.warn("Warning: Stacked Area Plot does not support cropped rendering.");
33+
return this;
34+
}
35+
36+
return super.croppedRenderingEnabled(croppedRendering);
2037
}
2138

2239
protected _getAnimator(key: string): Animator {

0 commit comments

Comments
 (0)