Remove variable re-definitions

[dygraphs.git] / dygraph-tickers.js

diff --git a/dygraph-tickers.js b/dygraph-tickers.js
index 20a7519..c80bdf5 100644 (file)
--- a/dygraph-tickers.js
+++ b/dygraph-tickers.js
@@ -176,7 +176,7 @@ Dygraph.numericTicks = function(a, b, pixels, opts, dygraph, vals) {
   if (opts("labelsKMG2")) {
     if (k) Dygraph.warn("Setting both labelsKMB and labelsKMG2. Pick one!");
     k = 1024;
-    k_labels = [ "k", "M", "G", "T", "P", "E" ];
+    k_labels = [ "k", "M", "G", "T", "P", "E", "Z", "Y" ];
     m_labels = [ "m", "u", "n", "p", "f", "a", "z", "y" ];
   }
 
@@ -203,7 +203,7 @@ Dygraph.numericTicks = function(a, b, pixels, opts, dygraph, vals) {
     }
     if(opts("labelsKMG2")){
       tickV = String(tickV.toExponential());
-      if(tickV.split('e-').length === 2 && tickV.split('e-')[1] >= 3){
+      if(tickV.split('e-').length === 2 && tickV.split('e-')[1] >= 3 && tickV.split('e-')[1] <= 24){
         if(tickV.split('e-')[1] % 3 > 0) {
           label = Dygraph.round_(tickV.split('e-')[0] /
               Math.pow(10,(tickV.split('e-')[1] % 3)),