change to an implementation based on set names

[dygraphs.git] / tests / annotation.html

diff --git a/tests/annotation.html b/tests/annotation.html
index f4191df..776c29a 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>
@@ -19,7 +22,7 @@
     <input type="button" value="Add Annotation" onclick="add()" />
     <input type="button" value="Shove to bottom" onclick="bottom(this)" />
     <div id="events"> </div>
-    <div style="position:absolute; left:200px; top: 200px;" id="g"></div>
+    <div style="position:absolute; left:200px; top: 200px;" id="g_div"></div>
     <div style="position:absolute; left:700px; top: 200px;" id="list"></div>
 
     <script type="text/javascript">
@@ -28,8 +31,8 @@
         return "(" + ann.series + ", " + ann.x + ")";
       }
 
-      g = new DateGraph(
-              document.getElementById("g"),
+      g = new Dygraph(
+              document.getElementById("g_div"),
               function() {
                 var zp = function(x) { if (x < 10) return "0"+x; else return x; };
                 var r = "date,parabola,line,another line,sine wave\n";
@@ -58,7 +61,7 @@
                     html += ann[i].text + "</span><br/>";
                   }
                   document.getElementById("list").innerHTML = html;
-                },
+                }
               }
           );
 
@@ -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',