Factor out ticker functions and clean up their semantics/usage.

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

index b6e81e6..b008ad8 100644 (file)
--- a/tests/x-axis-formatter.html
+++ b/tests/x-axis-formatter.html
@@ -6,10 +6,12 @@
      <!--[if IE]>
      <script type="text/javascript" src="../excanvas.js"></script>
      <![endif]-->
-    <script type="text/javascript" src="../strftime/strftime-min.js"></script>
-    <script type="text/javascript" src="../rgbcolor/rgbcolor.js"></script>
-    <script type="text/javascript" src="../dygraph-canvas.js"></script>
-    <script type="text/javascript" src="../dygraph.js"></script>
+    <!--
+    For production (minified) code, use:
+    <script type="text/javascript" src="dygraph-combined.js"></script>
+    -->
+    <script type="text/javascript" src="../dygraph-dev.js"></script>
+
    </head>
    <body>
      <p>Original data:</p>
@@ -43,10 +45,13 @@
              document.getElementById("offby2"),
              HourlyData(),
              { 
-              xAxisLabelFormatter:
-                function(d, gran) {
-                  return Dygraph.dateAxisFormatter(new Date(d.getTime() + 7200*1000), gran);
+              axes: {
+                x: {
+                  axisLabelFormatter: function(d, gran) {
+                      return Dygraph.dateAxisFormatter(new Date(d.getTime() + 7200*1000), gran);
+                  }
                  }
+              }
              });
  
        new Dygraph(
@@ -54,12 +59,15 @@
              HourlyData(),
              { 
                xAxisLabelWidth: 70,
-              xAxisLabelFormatter:
-                function(d, gran) {
-                  return Dygraph.zeropad(d.getHours()) + ":"
-                      + Dygraph.zeropad(d.getMinutes()) + ":"
-                      + Dygraph.zeropad(d.getSeconds());
+              axes: {
+                x: {
+                  axisLabelFormatter: function(d, gran) {
+                    return Dygraph.zeropad(d.getHours()) + ":"
+                        + Dygraph.zeropad(d.getMinutes()) + ":"
+                        + Dygraph.zeropad(d.getSeconds());
+                  }
                  }
+              }
              });
      </script>
    </body>