Merge pull request #3035 from palantir/r2.0.0

Release version 2.0.0 (--> master)
palantir · Dec 11, 2015 · 1123ae9 · 1123ae9
2 parents cd18127 + 94b13e8
commit 1123ae9
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 8 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "plottable",
   "description": "A modular charting library built on D3",
-  "version": "2.0.0-rc2",
+  "version": "2.0.0",
   "main": [
     "plottable.js",
     "plottable.css"

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "plottable.js",
   "description": "A modular charting library built on D3",
-  "version": "2.0.0-rc2",
+  "version": "2.0.0",
   "license": "MIT",
   "repository": {
     "type": "git",

diff --git a/plottable.d.ts b/plottable.d.ts
@@ -3665,6 +3665,8 @@ declare module Plottable.Plots {
          * @constructor
          */
         constructor();
+        croppedRenderingEnabled(): boolean;
+        croppedRenderingEnabled(croppedRendering: boolean): this;
         protected _getAnimator(key: string): Animator;
         protected _setup(): void;
         x(): Plots.AccessorScaleBinding<X, number>;

diff --git a/plottable.js b/plottable.js
@@ -1,5 +1,5 @@
 /*!
-Plottable 2.0.0-rc2 (https://github.com/palantir/plottable)
+Plottable 2.0.0 (https://github.com/palantir/plottable)
 Copyright 2014-2015 Palantir Technologies
 Licensed under MIT (https://github.com/palantir/plottable/blob/master/LICENSE)
 */
@@ -885,7 +885,7 @@ var Plottable;
 })(Plottable || (Plottable = {}));
 var Plottable;
 (function (Plottable) {
-    Plottable.version = "2.0.0-rc2";
+    Plottable.version = "2.0.0";
 })(Plottable || (Plottable = {}));
 var Plottable;
 (function (Plottable) {
@@ -9328,7 +9328,19 @@ var Plottable;
                 this._stackingResult = new Plottable.Utils.Map();
                 this._stackedExtent = [];
                 this._baselineValueProvider = function () { return [_this._baselineValue]; };
+                this.croppedRenderingEnabled(false);
             }
+            StackedArea.prototype.croppedRenderingEnabled = function (croppedRendering) {
+                if (croppedRendering == null) {
+                    return _super.prototype.croppedRenderingEnabled.call(this);
+                }
+                if (croppedRendering === true) {
+                    // HACKHACK #3032: cropped rendering doesn't currently work correctly on StackedArea
+                    Plottable.Utils.Window.warn("Warning: Stacked Area Plot does not support cropped rendering.");
+                    return this;
+                }
+                return _super.prototype.croppedRenderingEnabled.call(this, croppedRendering);
+            };
             StackedArea.prototype._getAnimator = function (key) {
                 return new Plottable.Animators.Null();
             };

diff --git a/plottable.min.js b/plottable.min.js
diff --git a/plottable.zip b/plottable.zip
diff --git a/src/plots/stackedAreaPlot.ts b/src/plots/stackedAreaPlot.ts
@@ -17,6 +17,23 @@ module Plottable.Plots {
       this._stackingResult = new Utils.Map<Dataset, Utils.Map<string, Utils.Stacking.StackedDatum>>();
       this._stackedExtent = [];
       this._baselineValueProvider = () => [this._baselineValue];
+      this.croppedRenderingEnabled(false);
+    }
+
+    public croppedRenderingEnabled(): boolean;
+    public croppedRenderingEnabled(croppedRendering: boolean): this;
+    public croppedRenderingEnabled(croppedRendering?: boolean): any {
+      if (croppedRendering == null) {
+        return super.croppedRenderingEnabled();
+      }
+
+      if (croppedRendering === true) {
+        // HACKHACK #3032: cropped rendering doesn't currently work correctly on StackedArea
+        Utils.Window.warn("Warning: Stacked Area Plot does not support cropped rendering.");
+        return this;
+      }
+
+      return super.croppedRenderingEnabled(croppedRendering);
     }
 
     protected _getAnimator(key: string): Animator {