findClosestPoint visibility bias fix, as described in this issue;

[dygraphs.git] / dygraph-tickers.js

diff --git a/dygraph-tickers.js b/dygraph-tickers.js
index 20a7519..dada4cd 100644 (file)
--- a/dygraph-tickers.js
+++ b/dygraph-tickers.js
@@ -71,6 +71,15 @@ Dygraph.numericLinearTicks = function(a, b, pixels, opts, dygraph, vals) {
 };
 
 Dygraph.numericTicks = function(a, b, pixels, opts, dygraph, vals) {
+  // This masks some numeric issues in older versions of Firefox,
+  // where 1.0/Math.pow(10,2) != Math.pow(10,-2).
+  var pow = function(base, exp) {
+    if (exp < 0) {
+      return 1.0 / Math.pow(base, -exp);
+    }
+    return Math.pow(base, exp);
+  };
+
   var pixels_per_tick = opts('pixelsPerLabel');
   var ticks = [];
   var i, j, tickV, nTicks;
@@ -138,9 +147,9 @@ Dygraph.numericTicks = function(a, b, pixels, opts, dygraph, vals) {
       for (i = -10; i < 50; i++) {
         var base_scale;
         if (kmg2) {
-          base_scale = Math.pow(16, i);
+          base_scale = pow(16, i);
         } else {
-          base_scale = Math.pow(10, i);
+          base_scale = pow(10, i);
         }
         var spacing = 0;
         for (j = 0; j < mults.length; j++) {
@@ -176,7 +185,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" ];
   }
 
@@ -192,7 +201,7 @@ Dygraph.numericTicks = function(a, b, pixels, opts, dygraph, vals) {
     if (k_labels.length > 0) {
       // TODO(danvk): should this be integrated into the axisLabelFormatter?
       // Round up to an appropriate unit.
-      var n = Math.pow(k, k_labels.length);
+      var n = pow(k, k_labels.length);
       for (j = k_labels.length - 1; j >= 0; j--, n /= k) {
         if (absTickV >= n) {
           label = Dygraph.round_(tickV / n, opts('digitsAfterDecimal')) +
@@ -203,10 +212,10 @@ 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)),
+              pow(10,(tickV.split('e-')[1] % 3)),
               opts('digitsAfterDecimal'));
         } else {
           label = Number(tickV.split('e-')[0]).toFixed(2);