X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=tests%2Fx-axis-formatter.html;h=ef884e374e99b22fcaf1f0d402c6440cb2543a42;hb=93ec1094eb75477b455efaa7adeb10190b87992b;hp=d216c9796afbc593fe3a350c907529b301e7d94e;hpb=795b16307db2a673ba7aa3452f6f6b0e93baeb3a;p=dygraphs.git
diff --git a/tests/x-axis-formatter.html b/tests/x-axis-formatter.html
index d216c97..ef884e3 100644
--- a/tests/x-axis-formatter.html
+++ b/tests/x-axis-formatter.html
@@ -1,16 +1,12 @@
-
X Axis Label Formatting
-
-
+
@@ -35,6 +31,9 @@
"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;
+ }
var g1 = new Dygraph(
document.getElementById("normal"),
@@ -47,8 +46,8 @@
{
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);
}
}
}
@@ -58,13 +57,13 @@
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());
}
}
}