Dygraph.dateString_: shows milliseconds if any. (#774)

[dygraphs.git] / tests / x-axis-formatter.html
diff --git a/tests/x-axis-formatter.html b/tests/x-axis-formatter.html

index b008ad8..ef884e3 100644 (file)
--- a/tests/x-axis-formatter.html
+++ b/tests/x-axis-formatter.html
@@ -1,16 +1,12 @@
  <!DOCTYPE html>
  <html>
    <head>
-    <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7; IE=EmulateIE9">
      <title>X Axis Label Formatting</title>
-    <!--[if IE]>
-    <script type="text/javascript" src="../excanvas.js"></script>
-    <![endif]-->
      <!--
      For production (minified) code, use:
      <script type="text/javascript" src="dygraph-combined.js"></script>
      -->
-    <script type="text/javascript" src="../dygraph-dev.js"></script>
+    <script type="text/javascript" src="../dist/dygraph.js"></script>
  
    </head>
    <body>
@@ -35,36 +31,39 @@
            "2009/07/12 05:00:00,3,6\n" +
            "2009/07/12 06:00:00,4,6"
        }
+      function zeropad(x) {
+        return (x < 10) ? '0' + x : x;
+      }
  
-      new Dygraph(
+      var g1 = new Dygraph(
              document.getElementById("normal"),
              HourlyData()
            );
  
-      new Dygraph(
+      var g2 = new Dygraph(
              document.getElementById("offby2"),
              HourlyData(),
              { 
                axes: {
                  x: {
-                  axisLabelFormatter: function(d, gran) {
-                      return Dygraph.dateAxisFormatter(new Date(d.getTime() + 7200*1000), gran);
+                  axisLabelFormatter: function(d, gran, opts) {
+                      return Dygraph.dateAxisLabelFormatter(new Date(d.getTime() + 7200*1000), gran, opts);
                    }
                  }
                }
              });
  
-      new Dygraph(
+      var g3 = new Dygraph(
              document.getElementById("seconds"),
              HourlyData(),
              { 
-              xAxisLabelWidth: 70,
                axes: {
                  x: {
+                  axisLabelWidth: 70,
                    axisLabelFormatter: function(d, gran) {
-                    return Dygraph.zeropad(d.getHours()) + ":"
-                        + Dygraph.zeropad(d.getMinutes()) + ":"
-                        + Dygraph.zeropad(d.getSeconds());
+                    return zeropad(d.getHours()) + ":"
+                        + zeropad(d.getMinutes()) + ":"
+                        + zeropad(d.getSeconds());
                    }
                  }
                }