X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=src%2Fdygraph-utils.js;h=c0b8f34b60b5f3f80494e944c265825da9c37f3e;hb=ac422b3aa23612c220b14e938fbae79d01b40b86;hp=c319e497c90eab424185e32c064f7570a862a677;hpb=aec24511f59ace8681d28cb5d11d04f9f57357b4;p=dygraphs.git

diff --git a/src/dygraph-utils.js b/src/dygraph-utils.js
index c319e49..c0b8f34 100644
--- a/src/dygraph-utils.js
+++ b/src/dygraph-utils.js
@@ -42,7 +42,7 @@ export var logRangeFraction = function(r0, r1, pct) {
   // Original calcuation:
   // pct = (log(x) - log(xRange[0])) / (log(xRange[1]) - log(xRange[0])));
   //
-  // Multiply both sides by the right-side demoninator.
+  // Multiply both sides by the right-side denominator.
   // pct * (log(xRange[1] - log(xRange[0]))) = log(x) - log(xRange[0])
   //
   // add log(xRange[0]) to both sides
@@ -265,7 +265,7 @@ export function isValidPoint(p, opt_allowNaNY) {
 };
 
 /**
- * Number formatting function which mimicks the behavior of %g in printf, i.e.
+ * Number formatting function which mimics the behavior of %g in printf, i.e.
  * either exponential or fixed format (without trailing 0s) is used depending on
  * the length of the generated string.  The advantage of this format is that
  * there is a predictable upper bound on the resulting string length,
@@ -377,7 +377,7 @@ export function hmsString_(hh, mm, ss, ms) {
 /**
  * Convert a JS date (millis since epoch) to a formatted string.
  * @param {number} time The JavaScript time value (ms since epoch)
- * @param {boolean} utc Wether output UTC or local time
+ * @param {boolean} utc Whether output UTC or local time
  * @return {string} A date of one of these forms:
  *     "YYYY/MM/DD", "YYYY/MM/DD HH:MM" or "YYYY/MM/DD HH:MM:SS"
  * @private
@@ -841,7 +841,6 @@ var pixelSafeOptions = {
   'highlightCallback': true,
   'highlightCircleSize': true,
   'interactionModel': true,
-  'isZoomedIgnoreProgrammaticZoom': true,
   'labelsDiv': true,
   'labelsKMB': true,
   'labelsKMG2': true,
@@ -1215,6 +1214,12 @@ export function dateAxisLabelFormatter(date, granularity, opts) {
     if (frac === 0 || granularity >= DygraphTickers.Granularity.DAILY) {
       // e.g. '21 Jan' (%d%b)
       return zeropad(day) + ' ' + SHORT_MONTH_NAMES_[month];
+    } else if (granularity < DygraphTickers.Granularity.SECONDLY) {
+      // e.g. 40.310 (meaning 40 seconds and 310 milliseconds)
+      var str = "" + millis;
+      return zeropad(secs) + "." + ('000'+str).substring(str.length);
+    } else if (granularity > DygraphTickers.Granularity.MINUTELY) {
+      return hmsString_(hours, mins, secs, 0);
     } else {
       return hmsString_(hours, mins, secs, millis);
     }