merge iconWidth/iconHeight with width/height

[dygraphs.git] / tests / annotation.html

diff --git a/tests/annotation.html b/tests/annotation.html
index f4191df..0976052 100644 (file)
--- a/tests/annotation.html
+++ b/tests/annotation.html
@@ -4,6 +4,9 @@
     <!--[if IE]>
     <script type="text/javascript" src="excanvas.js"></script>
     <![endif]-->
+    <!--
+    <script type="text/javascript" src="dygraph-combined.js"></script>
+    -->
     <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>
@@ -28,7 +31,7 @@
         return "(" + ann.series + ", " + ann.x + ")";
       }
 
-      g = new DateGraph(
+      g = new Dygraph(
               document.getElementById("g"),
               function() {
                 var zp = function(x) { if (x < 10) return "0"+x; else return x; };
@@ -77,8 +80,8 @@
         series: 'another line',
         x: "20061013",
         icon: 'dollar.png',
-        iconWidth: 18,
-        iconHeight: 23,
+        width: 18,
+        height: 23,
         tickHeight: 4,
         text: 'Another one',
         cssClass: 'annotation',