[TS1.7] more this-typing

palantir · Dec 2, 2015 · 410f705 · 410f705
1 parent 21a1fcb
commit 410f705
Show file tree

Hide file tree

Showing 8 changed files with 44 additions and 44 deletions.
diff --git a/plottable.d.ts b/plottable.d.ts
@@ -2056,7 +2056,7 @@ declare module Plottable.Axes {
          * @param {boolean} The new text width approximation setting.
          * @returns {Axes.Numeric} The calling Axes.Numeric.
          */
-        usesTextWidthApproximation(enable: boolean): Axes.Numeric;
+        usesTextWidthApproximation(enable: boolean): this;
         private _hideEndTickLabels();
         private _hideOverflowingTickLabels();
         private _hideOverlappingTickLabels();
@@ -2799,7 +2799,7 @@ declare module Plottable {
          * @param {number|string|Accessor<number>|Accessor<string>} attrValue
          * @returns {Plot} The calling Plot.
          */
-        attr(attr: string, attrValue: number | string | Accessor<number> | Accessor<string>): Plot;
+        attr(attr: string, attrValue: number | string | Accessor<number> | Accessor<string>): this;
         /**
          * Sets a particular attribute to a scaled constant value or scaled result of an Accessor.
          * The provided Scale will account for the attribute values when autoDomain()-ing.
@@ -2809,7 +2809,7 @@ declare module Plottable {
          * @param {Scale<A, number | string>} scale The Scale used to scale the attrValue.
          * @returns {Plot} The calling Plot.
          */
-        attr<A>(attr: string, attrValue: A | Accessor<A>, scale: Scale<A, number | string>): Plot;
+        attr<A>(attr: string, attrValue: A | Accessor<A>, scale: Scale<A, number | string>): this;
         protected _bindProperty(property: string, value: any, scale: Scale<any, any>): void;
         private _bindAttr(attr, value, scale);
         protected _generateAttrToProjector(): AttributeToProjector;
@@ -2821,7 +2821,7 @@ declare module Plottable {
         /**
          * Enables or disables animation.
          */
-        animated(willAnimate: boolean): Plot;
+        animated(willAnimate: boolean): this;
         detach(): this;
         /**
          * @returns {Scale[]} A unique array of all scales currently used by the Plot.
@@ -2952,7 +2952,7 @@ declare module Plottable.Plots {
          * @param {number|Accessor<number>} sectorValue
          * @returns {Pie} The calling Pie Plot.
          */
-        sectorValue(sectorValue: number | Accessor<number>): Plots.Pie;
+        sectorValue(sectorValue: number | Accessor<number>): this;
         /**
          * Sets the sector value to a scaled constant value or scaled result of an Accessor.
          * The provided Scale will account for the values when autoDomain()-ing.
@@ -2961,7 +2961,7 @@ declare module Plottable.Plots {
          * @param {Scale<S, number>} scale
          * @returns {Pie} The calling Pie Plot.
          */
-        sectorValue<S>(sectorValue: S | Accessor<S>, scale: Scale<S, number>): Plots.Pie;
+        sectorValue<S>(sectorValue: S | Accessor<S>, scale: Scale<S, number>): this;
         /**
          * Gets the AccessorScaleBinding for the inner radius.
          */
@@ -2972,7 +2972,7 @@ declare module Plottable.Plots {
          * @param {number|Accessor<number>} innerRadius
          * @returns {Pie} The calling Pie Plot.
          */
-        innerRadius(innerRadius: number | Accessor<number>): Plots.Pie;
+        innerRadius(innerRadius: number | Accessor<number>): any;
         /**
          * Sets the inner radius to a scaled constant value or scaled result of an Accessor.
          * The provided Scale will account for the values when autoDomain()-ing.
@@ -2981,7 +2981,7 @@ declare module Plottable.Plots {
          * @param {Scale<R, number>} scale
          * @returns {Pie} The calling Pie Plot.
          */
-        innerRadius<R>(innerRadius: R | Accessor<R>, scale: Scale<R, number>): Plots.Pie;
+        innerRadius<R>(innerRadius: R | Accessor<R>, scale: Scale<R, number>): any;
         /**
          * Gets the AccessorScaleBinding for the outer radius.
          */
@@ -2992,7 +2992,7 @@ declare module Plottable.Plots {
          * @param {number|Accessor<number>} outerRadius
          * @returns {Pie} The calling Pie Plot.
          */
-        outerRadius(outerRadius: number | Accessor<number>): Plots.Pie;
+        outerRadius(outerRadius: number | Accessor<number>): this;
         /**
          * Sets the outer radius to a scaled constant value or scaled result of an Accessor.
          * The provided Scale will account for the values when autoDomain()-ing.
@@ -3001,7 +3001,7 @@ declare module Plottable.Plots {
          * @param {Scale<R, number>} scale
          * @returns {Pie} The calling Pie Plot.
          */
-        outerRadius<R>(outerRadius: R | Accessor<R>, scale: Scale<R, number>): Plots.Pie;
+        outerRadius<R>(outerRadius: R | Accessor<R>, scale: Scale<R, number>): this;
         /**
          * Get whether slice labels are enabled.
          *
@@ -3327,7 +3327,7 @@ declare module Plottable.Plots {
          * @param {number|Accessor<number>} size
          * @returns {Plots.Scatter} The calling Scatter Plot.
          */
-        size(size: number | Accessor<number>): Plots.Scatter<X, Y>;
+        size(size: number | Accessor<number>): this;
         /**
          * Sets the size property to a scaled constant value or scaled result of an Accessor.
          * The provided Scale will account for the values when autoDomain()-ing.
@@ -3336,7 +3336,7 @@ declare module Plottable.Plots {
          * @param {Scale<S, number>} scale
          * @returns {Plots.Scatter} The calling Scatter Plot.
          */
-        size<S>(size: S | Accessor<S>, scale: Scale<S, number>): Plots.Scatter<X, Y>;
+        size<S>(size: S | Accessor<S>, scale: Scale<S, number>): this;
         /**
          * Gets the AccessorScaleBinding for the symbol property of the plot.
          * The symbol property corresponds to how the symbol will be drawn.
@@ -3348,7 +3348,7 @@ declare module Plottable.Plots {
          * @param {Accessor<SymbolFactory>} symbol
          * @returns {Plots.Scatter} The calling Scatter Plot.
          */
-        symbol(symbol: Accessor<SymbolFactory>): Plots.Scatter<X, Y>;
+        symbol(symbol: Accessor<SymbolFactory>): this;
         protected _generateDrawSteps(): Drawers.DrawStep[];
         /**
          * @deprecated As of release v1.1.0, replaced by _entityVisibleOnPlot()
@@ -3565,7 +3565,7 @@ declare module Plottable.Plots {
          * Smooth autoranging is done by making sure lines always exit on the left / right side of the plot
          * and deactivating the nice domain feature on the scales
          */
-        autorangeSmooth(autorangeSmooth: boolean): Plots.Line<X>;
+        autorangeSmooth(autorangeSmooth: boolean): this;
         private _setScaleSnapping();
         /**
          * Gets the interpolation function associated with the plot.
@@ -3579,7 +3579,7 @@ declare module Plottable.Plots {
          * @param {string | points: Array<[number, number]>) => string} interpolator Interpolation function
          * @return Plots.Line
          */
-        interpolator(interpolator: string | ((points: Array<[number, number]>) => string)): Plots.Line<X>;
+        interpolator(interpolator: string | ((points: Array<[number, number]>) => string)): this;
         interpolator(interpolator: "linear"): this;
         interpolator(interpolator: "linear-closed"): this;
         interpolator(interpolator: "step"): this;
@@ -3604,7 +3604,7 @@ declare module Plottable.Plots {
          *
          * @returns {Plots.Line} The calling Plots.Line
          */
-        downsamplingEnabled(downsampling: boolean): Plots.Line<X>;
+        downsamplingEnabled(downsampling: boolean): this;
         /**
          * Gets if croppedRendering is enabled
          *
@@ -3616,7 +3616,7 @@ declare module Plottable.Plots {
          *
          * @returns {Plots.Line} The calling Plots.Line
          */
-        croppedRenderingEnabled(croppedRendering: boolean): Plots.Line<X>;
+        croppedRenderingEnabled(croppedRendering: boolean): this;
         protected _createDrawer(dataset: Dataset): Drawer;
         protected _extentsForProperty(property: string): any[];
         private _getEdgeIntersectionPoints();
@@ -3733,7 +3733,7 @@ declare module Plottable.Plots {
          * For now, downsampling is always disabled in stacked area plot
          * @returns {Plots.StackedArea} The calling Plots.StackedArea
          */
-        downsamplingEnabled(downsampling: boolean): Plots.Line<X>;
+        downsamplingEnabled(downsampling: boolean): this;
         protected _additionalPaint(): void;
         protected _updateYScale(): void;
         protected _onDatasetUpdate(): this;
@@ -4642,7 +4642,7 @@ declare module Plottable.Interactions {
          *
          * @returns {Interactions.PanZoom} The calling PanZoom Interaction.
          */
-        xScales(xScales: QuantitativeScale<any>[]): Interactions.PanZoom;
+        xScales(xScales: QuantitativeScale<any>[]): this;
         /**
          * Gets the y scales for this PanZoom Interaction.
          */
@@ -4652,7 +4652,7 @@ declare module Plottable.Interactions {
          *
          * @returns {Interactions.PanZoom} The calling PanZoom Interaction.
          */
-        yScales(yScales: QuantitativeScale<any>[]): Interactions.PanZoom;
+        yScales(yScales: QuantitativeScale<any>[]): this;
         /**
          * Adds an x scale to this PanZoom Interaction
          *
@@ -4701,7 +4701,7 @@ declare module Plottable.Interactions {
          * @param {D} minDomainExtent The minimum domain extent for the scale.
          * @returns {Interactions.PanZoom} The calling PanZoom Interaction.
          */
-        minDomainExtent<D>(quantitativeScale: QuantitativeScale<D>, minDomainExtent: D): Interactions.PanZoom;
+        minDomainExtent<D>(quantitativeScale: QuantitativeScale<D>, minDomainExtent: D): this;
         /**
          * Gets the maximum domain extent for the scale, specifying the maximum allowable amount
          * between the ends of the domain.
@@ -4722,7 +4722,7 @@ declare module Plottable.Interactions {
          * @param {D} minDomainExtent The maximum domain extent for the scale.
          * @returns {Interactions.PanZoom} The calling PanZoom Interaction.
          */
-        maxDomainExtent<D>(quantitativeScale: QuantitativeScale<D>, maxDomainExtent: D): Interactions.PanZoom;
+        maxDomainExtent<D>(quantitativeScale: QuantitativeScale<D>, maxDomainExtent: D): this;
     }
 }
 declare module Plottable {

diff --git a/src/axes/numericAxis.ts b/src/axes/numericAxis.ts
@@ -290,7 +290,7 @@ module Plottable.Axes {
      * @param {boolean} The new text width approximation setting.
      * @returns {Axes.Numeric} The calling Axes.Numeric.
      */
-    public usesTextWidthApproximation(enable: boolean): Axes.Numeric;
+    public usesTextWidthApproximation(enable: boolean): this;
     public usesTextWidthApproximation(enable?: boolean): any {
       if (enable == null) {
         return this._usesTextWidthApproximation;

diff --git a/src/interactions/panZoomInteraction.ts b/src/interactions/panZoomInteraction.ts
@@ -258,7 +258,7 @@ module Plottable.Interactions {
      *
      * @returns {Interactions.PanZoom} The calling PanZoom Interaction.
      */
-    public xScales(xScales: QuantitativeScale<any>[]): Interactions.PanZoom;
+    public xScales(xScales: QuantitativeScale<any>[]): this;
     public xScales(xScales?: QuantitativeScale<any>[]): any {
       if (xScales == null) {
         let scales: QuantitativeScale<any>[] = [];
@@ -283,7 +283,7 @@ module Plottable.Interactions {
      *
      * @returns {Interactions.PanZoom} The calling PanZoom Interaction.
      */
-    public yScales(yScales: QuantitativeScale<any>[]): Interactions.PanZoom;
+    public yScales(yScales: QuantitativeScale<any>[]): this;
     public yScales(yScales?: QuantitativeScale<any>[]): any {
       if (yScales == null) {
         let scales: QuantitativeScale<any>[] = [];
@@ -367,7 +367,7 @@ module Plottable.Interactions {
      * @param {D} minDomainExtent The minimum domain extent for the scale.
      * @returns {Interactions.PanZoom} The calling PanZoom Interaction.
      */
-    public minDomainExtent<D>(quantitativeScale: QuantitativeScale<D>, minDomainExtent: D): Interactions.PanZoom;
+    public minDomainExtent<D>(quantitativeScale: QuantitativeScale<D>, minDomainExtent: D): this;
     public minDomainExtent<D>(quantitativeScale: QuantitativeScale<D>, minDomainExtent?: D): any {
       if (minDomainExtent == null) {
         return this._minDomainExtents.get(quantitativeScale);
@@ -406,7 +406,7 @@ module Plottable.Interactions {
      * @param {D} minDomainExtent The maximum domain extent for the scale.
      * @returns {Interactions.PanZoom} The calling PanZoom Interaction.
      */
-    public maxDomainExtent<D>(quantitativeScale: QuantitativeScale<D>, maxDomainExtent: D): Interactions.PanZoom;
+    public maxDomainExtent<D>(quantitativeScale: QuantitativeScale<D>, maxDomainExtent: D): this;
     public maxDomainExtent<D>(quantitativeScale: QuantitativeScale<D>, maxDomainExtent?: D): any {
       if (maxDomainExtent == null) {
         return this._maxDomainExtents.get(quantitativeScale);

diff --git a/src/plots/linePlot.ts b/src/plots/linePlot.ts
@@ -83,7 +83,7 @@ module Plottable.Plots {
      * Smooth autoranging is done by making sure lines always exit on the left / right side of the plot
      * and deactivating the nice domain feature on the scales
      */
-    public autorangeSmooth(autorangeSmooth: boolean): Plots.Line<X>;
+    public autorangeSmooth(autorangeSmooth: boolean): this;
     public autorangeSmooth(autorangeSmooth?: boolean): any {
       if (autorangeSmooth == null) {
         return this._autorangeSmooth;
@@ -115,7 +115,7 @@ module Plottable.Plots {
      * @param {string | points: Array<[number, number]>) => string} interpolator Interpolation function
      * @return Plots.Line
      */
-    public interpolator(interpolator: string | ((points: Array<[number, number]>) => string)): Plots.Line<X>;
+    public interpolator(interpolator: string | ((points: Array<[number, number]>) => string)): this;
     public interpolator(interpolator: "linear"): this;
     public interpolator(interpolator: "linear-closed"): this;
     public interpolator(interpolator: "step"): this;
@@ -148,7 +148,7 @@ module Plottable.Plots {
      *
      * @returns {Plots.Line} The calling Plots.Line
      */
-    public downsamplingEnabled(downsampling: boolean): Plots.Line<X>;
+    public downsamplingEnabled(downsampling: boolean): this;
     public downsamplingEnabled(downsampling?: boolean): any {
       if (downsampling == null) {
         return this._downsamplingEnabled;
@@ -168,7 +168,7 @@ module Plottable.Plots {
      *
      * @returns {Plots.Line} The calling Plots.Line
      */
-    public croppedRenderingEnabled(croppedRendering: boolean): Plots.Line<X>;
+    public croppedRenderingEnabled(croppedRendering: boolean): this;
     public croppedRenderingEnabled(croppedRendering?: boolean): any {
       if (croppedRendering == null) {
         return this._croppedRenderingEnabled;

diff --git a/src/plots/piePlot.ts b/src/plots/piePlot.ts
@@ -120,7 +120,7 @@ module Plottable.Plots {
      * @param {number|Accessor<number>} sectorValue
      * @returns {Pie} The calling Pie Plot.
      */
-    public sectorValue(sectorValue: number | Accessor<number>): Plots.Pie;
+    public sectorValue(sectorValue: number | Accessor<number>): this;
     /**
      * Sets the sector value to a scaled constant value or scaled result of an Accessor.
      * The provided Scale will account for the values when autoDomain()-ing.
@@ -129,7 +129,7 @@ module Plottable.Plots {
      * @param {Scale<S, number>} scale
      * @returns {Pie} The calling Pie Plot.
      */
-    public sectorValue<S>(sectorValue: S | Accessor<S>, scale: Scale<S, number>): Plots.Pie;
+    public sectorValue<S>(sectorValue: S | Accessor<S>, scale: Scale<S, number>): this;
     public sectorValue<S>(sectorValue?: number | Accessor<number> | S | Accessor<S>, scale?: Scale<S, number>): any {
       if (sectorValue == null) {
         return this._propertyBindings.get(Pie._SECTOR_VALUE_KEY);
@@ -150,7 +150,7 @@ module Plottable.Plots {
      * @param {number|Accessor<number>} innerRadius
      * @returns {Pie} The calling Pie Plot.
      */
-    public innerRadius(innerRadius: number | Accessor<number>): Plots.Pie;
+    public innerRadius(innerRadius: number | Accessor<number>): any;
     /**
      * Sets the inner radius to a scaled constant value or scaled result of an Accessor.
      * The provided Scale will account for the values when autoDomain()-ing.
@@ -159,7 +159,7 @@ module Plottable.Plots {
      * @param {Scale<R, number>} scale
      * @returns {Pie} The calling Pie Plot.
      */
-    public innerRadius<R>(innerRadius: R | Accessor<R>, scale: Scale<R, number>): Plots.Pie;
+    public innerRadius<R>(innerRadius: R | Accessor<R>, scale: Scale<R, number>): any;
     public innerRadius<R>(innerRadius?: number | Accessor<number> | R | Accessor<R>, scale?: Scale<R, number>): any {
       if (innerRadius == null) {
         return this._propertyBindings.get(Pie._INNER_RADIUS_KEY);
@@ -179,7 +179,7 @@ module Plottable.Plots {
      * @param {number|Accessor<number>} outerRadius
      * @returns {Pie} The calling Pie Plot.
      */
-    public outerRadius(outerRadius: number | Accessor<number>): Plots.Pie;
+    public outerRadius(outerRadius: number | Accessor<number>): this;
     /**
      * Sets the outer radius to a scaled constant value or scaled result of an Accessor.
      * The provided Scale will account for the values when autoDomain()-ing.
@@ -188,7 +188,7 @@ module Plottable.Plots {
      * @param {Scale<R, number>} scale
      * @returns {Pie} The calling Pie Plot.
      */
-    public outerRadius<R>(outerRadius: R | Accessor<R>, scale: Scale<R, number>): Plots.Pie;
+    public outerRadius<R>(outerRadius: R | Accessor<R>, scale: Scale<R, number>): this;
     public outerRadius<R>(outerRadius?: number | Accessor<number> | R | Accessor<R>, scale?: Scale<R, number>): any {
       if (outerRadius == null) {
         return this._propertyBindings.get(Pie._OUTER_RADIUS_KEY);

diff --git a/src/plots/plot.ts b/src/plots/plot.ts
@@ -130,7 +130,7 @@ export class Plot extends Component {
    * @param {number|string|Accessor<number>|Accessor<string>} attrValue
    * @returns {Plot} The calling Plot.
    */
-  public attr(attr: string, attrValue: number | string | Accessor<number> | Accessor<string>): Plot;
+  public attr(attr: string, attrValue: number | string | Accessor<number> | Accessor<string>): this;
   /**
    * Sets a particular attribute to a scaled constant value or scaled result of an Accessor.
    * The provided Scale will account for the attribute values when autoDomain()-ing.
@@ -140,7 +140,7 @@ export class Plot extends Component {
    * @param {Scale<A, number | string>} scale The Scale used to scale the attrValue.
    * @returns {Plot} The calling Plot.
    */
-  public attr<A>(attr: string, attrValue: A | Accessor<A>, scale: Scale<A, number | string>): Plot;
+  public attr<A>(attr: string, attrValue: A | Accessor<A>, scale: Scale<A, number | string>): this;
   public attr<A>(attr: string, attrValue?: number | string | Accessor<number> | Accessor<string> | A | Accessor<A>,
                  scale?: Scale<A, number | string>): any {
     if (attrValue == null) {
@@ -214,7 +214,7 @@ export class Plot extends Component {
   /**
    * Enables or disables animation.
    */
-  public animated(willAnimate: boolean): Plot;
+  public animated(willAnimate: boolean): this;
   public animated(willAnimate?: boolean): any {
     if (willAnimate == null) {
       return this._animate;