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

[dygraphs.git] / tests / number-display.html

diff --git a/tests/number-display.html b/tests/number-display.html
index 6e81adb..c6d93b3 100644 (file)
--- a/tests/number-display.html
+++ b/tests/number-display.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>
+
     <style type="text/css">
       .thinborder {
         border: 1px solid black;
@@ -96,10 +98,8 @@
     html += '</tr>\n';
 
     var attr = {};
-    var g_mock = {
-      attr_: function(x) {
-        return attr[x];
-      }
+    var opts = function(x) {
+      return attr[x];
     };
     for (var j = 0; j < nums.length; j++) {
       var x = nums[j];
@@ -107,11 +107,11 @@
       html += '<td>' + x + '</td>';
       for (var i = 0; i < scientific.length; i++) {
         attr = { sigFigs: scientific[i] };
-        html += '<td>' + Dygraph.numberFormatter(x, g_mock) + '</td>';
+        html += '<td>' + Dygraph.numberFormatter(x, opts) + '</td>';
       }
       for (var i = 0; i < fixed.length; i++) {
         attr = { sigFigs: null, digitsAfterDecimal: fixed[i][0], maxNumberWidth: fixed[i][1] };
-        html += '<td>' + Dygraph.numberFormatter(x, g_mock) + '</td>';
+        html += '<td>' + Dygraph.numberFormatter(x, opts) + '</td>';
       }
       html += '</tr>\n';
     }