update a few tests

diff --git a/tests/x-axis-formatter.html b/tests/x-axis-formatter.html
index b370a86..b008ad8 100644 (file)
--- a/tests/x-axis-formatter.html
+++ b/tests/x-axis-formatter.html
@@ -45,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(
@@ -56,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>

diff --git a/tests/y-axis-formatter.html b/tests/y-axis-formatter.html
index f3313b8..f2fbd00 100644 (file)
--- a/tests/y-axis-formatter.html
+++ b/tests/y-axis-formatter.html
@@ -51,11 +51,15 @@
                 ],
                 {
                     stepPlot: true,
-                    yValueFormatter: function(x) {
-                        var shift = Math.pow(10, 5)
-                        return Math.round(x * shift) / shift
-                    },
-                    labels: ["X", "Data"]
+                    labels: ["X", "Data"],
+                    axes: {
+                      y: {
+                        valueFormatter: function(x) {
+                          var shift = Math.pow(10, 5)
+                          return Math.round(x * shift) / shift
+                        },
+                      }
+                    }
                 }
             );
         </script>
@@ -74,15 +78,19 @@
                 ],
                 {
                     stepPlot: true,
-                    yValueFormatter: function(x) {
-                        var shift = Math.pow(10, 5)
-                        return "*" + Math.round(x * shift) / shift
-                    },
-                    yAxisLabelFormatter: function(x) {
-                        var shift = Math.pow(10, 5)
-                        return "+" + Math.round(x * shift) / shift
-                    },
-                    labels: ["X", "Data"]
+                    labels: ["X", "Data"],
+                    axes: {
+                      y: {
+                        valueFormatter: function(x) {
+                          var shift = Math.pow(10, 5)
+                          return "*" + Math.round(x * shift) / shift
+                        },
+                        axisLabelFormatter: function(x) {
+                          var shift = Math.pow(10, 5)
+                          return "+" + Math.round(x * shift) / shift
+                        }
+                      }
+                    }
                 }
             );
         </script>