Merge tag 'v0.20.3' into 674-bar-hover-label

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "plottable",
   "description": "A library for creating charts out of D3",
-  "version": "0.20.0",
+  "version": "0.20.3",
   "main": ["plottable.js", "plottable.css"],
   "license": "MIT",
   "ignore": [

package.json

@@ -1,6 +1,6 @@
 {
   "name": "plottable.js",
-  "version": "0.20.0",
+  "version": "0.20.3",
   "description": "Build flexible, performant, interactive charts using D3",
   "repository": {
     "type": "git",

plottable.d.ts

@@ -1576,7 +1576,7 @@ declare module Plottable {
             static TICK_MARK_CLASS: string;
             static TICK_LABEL_CLASS: string;
             public axisElement: D3.Selection;
-            constructor(scale: Scale, orientation: string, formatter?: Formatter);
+            constructor(scale: Scale, orientation: string, formatter?: any);
             public remove(): void;
             /**
             * Gets the current width.
@@ -1605,12 +1605,18 @@ declare module Plottable {
             */
             public height(h: any): Axis;
             /**
+            * Get the current formatter on the axis.
+            *
+            * @returns {Abstract.Formatter} the axis formatter
+            */
+            public formatter(): Formatter;
+            /**
             * Sets a new tick formatter.
             *
-            * @param {Abstract.Formatter} formatter
-            * @returns {BaseAxis} The calling BaseAxis.
+            * @param {function | Abstract.Formatter} formatter
+            * @returns {Abstract.Axis} The calling Axis.
             */
-            public formatter(formatter: Formatter): Axis;
+            public formatter(formatter: any): Axis;
             /**
             * Gets the current tick mark length.
             *
@@ -1680,7 +1686,7 @@ declare module Plottable {
             * @param {string} orientation The orientation of the QuantitiveScale (top/bottom/left/right)
             * @param {Formatter} [formatter] A function to format tick labels.
             */
-            constructor(scale: Abstract.QuantitiveScale, orientation: string, formatter?: Abstract.Formatter);
+            constructor(scale: Abstract.QuantitiveScale, orientation: string, formatter?: any);
             /**
             * Gets the tick label position relative to the tick marks.
             *
@@ -1738,7 +1744,7 @@ declare module Plottable {
             * @param {string} orientation The orientation of the Axis (top/bottom/left/right)
             * @param {formatter} [formatter] The Formatter for the Axis (default Formatter.Identity)
             */
-            constructor(scale: Scale.Ordinal, orientation?: string, formatter?: Formatter.Identity);
+            constructor(scale: Scale.Ordinal, orientation?: string, formatter?: any);
         }
     }
 }

plottable.js

@@ -1,5 +1,5 @@
 /*!
-Plottable 0.20.0 (https://github.com/palantir/plottable)
+Plottable 0.20.3 (https://github.com/palantir/plottable)
 Copyright 2014 Palantir Technologies
 Licensed under MIT (https://github.com/palantir/plottable/blob/master/LICENSE)
 */
@@ -1465,7 +1465,7 @@ var Plottable;
 ///<reference path="../reference.ts" />
 var Plottable;
 (function (Plottable) {
-    Plottable.version = "0.20.0";
+    Plottable.version = "0.20.3";
 })(Plottable || (Plottable = {}));
 
 ///<reference path="../reference.ts" />
@@ -4361,13 +4361,14 @@ var Plottable;
                 }
             };
 
-            /**
-            * Sets a new tick formatter.
-            *
-            * @param {Abstract.Formatter} formatter
-            * @returns {BaseAxis} The calling BaseAxis.
-            */
             Axis.prototype.formatter = function (formatter) {
+                if (formatter === undefined) {
+                    return this._formatter;
+                }
+                if (typeof (formatter) === "function") {
+                    formatter = new Plottable.Formatter.Custom(formatter);
+                    formatter.showOnlyUnchangedValues(false);
+                }
                 this._formatter = formatter;
                 this._invalidateLayout();
                 return this;