Merge pull request #187 from adilhn/rgbcolor_change

[dygraphs.git] / dygraph-tickers.js

diff --git a/dygraph-tickers.js b/dygraph-tickers.js
index 1395d23..b340626 100644 (file)
--- a/dygraph-tickers.js
+++ b/dygraph-tickers.js
@@ -193,7 +193,7 @@ Dygraph.numericTicks = function(a, b, pixels, opts, dygraph, vals) {
   }
 
   // Add formatted labels to the ticks.
-  var k = 1;
+  var k;
   var k_labels = [];
   var m_labels = [];
   if (opts("labelsKMB")) {
@@ -207,7 +207,9 @@ Dygraph.numericTicks = function(a, b, pixels, opts, dygraph, vals) {
     m_labels = [ "m", "u", "n", "p", "f", "a", "z", "y" ];
   }
 
-  var formatter = /**@type{Dygraph.AxisLabelFormatter}*/(opts('axisLabelFormatter'));
+  k = k || 1; // If neither option is specified.
+
+  var formatter = /**@type{AxisLabelFormatter}*/(opts('axisLabelFormatter'));
 
   // Add labels to the ticks.
   var digitsAfterDecimal = /** @type{number} */(opts('digitsAfterDecimal'));
@@ -379,7 +381,7 @@ Dygraph.numDateTicks = function(start_time, end_time, granularity) {
  * @return {!Dygraph.TickList}
  */
 Dygraph.getDateAxis = function(start_time, end_time, granularity, opts, dg) {
-  var formatter = /** @type{Dygraph.AxisLabelFormatter} */(
+  var formatter = /** @type{AxisLabelFormatter} */(
       opts("axisLabelFormatter"));
   var ticks = [];
   var t;