Merge pull request #746 from mrcslws/wrong-gap-edge-point

[dygraphs.git] / tests / value-axis-formatters.html
diff --git a/tests/value-axis-formatters.html b/tests/value-axis-formatters.html

index 184101e..31d61ea 100644 (file)
--- a/tests/value-axis-formatters.html
+++ b/tests/value-axis-formatters.html
@@ -1,16 +1,12 @@
  <!DOCTYPE html>
  <html>
    <head>
-    <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7; IE=EmulateIE9">
      <title>valueFormatter and axisLabelFormatter</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 style="max-width: 800px;">
@@ -43,6 +39,13 @@
                     1e6 * (2 - i * (100 - i) / (50 * 50))]);
        }
  
+      function formatDate(d) {
+        var yyyy = d.getFullYear(),
+            mm = d.getMonth() + 1,
+            dd = d.getDate();
+        return yyyy + '-' + (mm < 10 ? '0' : '') + mm + (dd < 10 ? '0' : '') + dd;
+      }
+
        g = new Dygraph(
            document.getElementById("demodiv"),
            data,
@@ -54,17 +57,16 @@
                'Y3': { axis: 'y2' },
                'Y4': { axis: 'y2' }
              },
-            xAxisLabelWidth: 100,
-            yAxisLabelWidth: 100,
              axes: {
                x: {
                  valueFormatter: function(ms) {
-                  return 'xvf(' + new Date(ms).strftime('%Y-%m-%d') + ')';
+                  return 'xvf(' + formatDate(new Date(ms)) + ')';
                  },
                  axisLabelFormatter: function(d) {
-                  return 'xalf(' + d.strftime('%Y-%m-%d') + ')';
+                  return 'xalf(' + formatDate(d) + ')';
                  },
                  pixelsPerLabel: 100,
+                axisLabelWidth: 100,
                },
                y: {
                  valueFormatter: function(y) {
@@ -72,7 +74,8 @@
                  },
                  axisLabelFormatter: function(y) {
                    return 'yalf(' + y.toPrecision(2) + ')';
-                }
+                },
+                axisLabelWidth: 100
                },
                y2: {
                  valueFormatter: function(y2) {