X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=tests%2Fannotation.html;h=c180070ffacbbe8da55bbd2408e3448e6aad5470;hb=ac422b3aa23612c220b14e938fbae79d01b40b86;hp=361c1cf275d26997b3709c3b50532be59d57f53d;hpb=a2b2c3a13b968bf10c9dbea58683b0f51011b547;p=dygraphs.git

diff --git a/tests/annotation.html b/tests/annotation.html
index 361c1cf..c180070 100644
--- a/tests/annotation.html
+++ b/tests/annotation.html
@@ -1,16 +1,10 @@
+<!DOCTYPE html>
 <html>
   <head>
+    <link rel="stylesheet" href="../dist/dygraph.css">
     <title>demo</title>
-    <!--[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>
-    <script type="text/javascript" src="../dygraph.js"></script>
+    <script type="text/javascript" src="../dist/dygraph.js"></script>
+
     <style type="text/css">
     .annotation {
     }
@@ -31,6 +25,9 @@
         return "(" + ann.series + ", " + ann.x + ")";
       }
 
+      annotations = [];
+      var graph_initialized = false;
+
       g = new Dygraph(
               document.getElementById("g_div"),
               function() {
@@ -51,14 +48,21 @@
                 showRoller: true,
                 width: 480,
                 height: 320,
-                drawCallback: function(g) {
+                drawCallback: function(g, is_initial) {
+                  if (is_initial) {
+                    graph_initialized = true;
+                    if (annotations.length > 0) {
+                      g.setAnnotations(annotations);
+                    }
+                  }
+
                   var ann = g.annotations();
                   var html = "";
                   for (var i = 0; i < ann.length; i++) {
                     var name = nameAnnotation(ann[i]);
                     html += "<span id='" + name + "'>"
-                    html += name + ": " + ann[i].shortText + " -> ";
-                    html += ann[i].text + "</span><br/>";
+                    html += name + ": " + (ann[i].shortText || '(icon)')
+                    html += " -> " + ann[i].text + "</span><br/>";
                   }
                   document.getElementById("list").innerHTML = html;
                 }
@@ -66,7 +70,6 @@
           );
 
       var last_ann = 0;
-      annotations = [];
       for (var x = 10; x < 15; x += 2) {
         annotations.push( {
           series: 'sine wave',
@@ -83,13 +86,24 @@
         width: 18,
         height: 23,
         tickHeight: 4,
+        tickColor: 'indianred',
+        tickWidth: 2,
         text: 'Another one',
         cssClass: 'annotation',
         clickHandler: function() {
           document.getElementById("events").innerHTML += "special handler<br/>";
         }
       } );
-      g.setAnnotations(annotations);
+      annotations.push( {
+        series: 'parabola',
+        x: '20061012',
+        shortText: 'P',
+        text: 'Parabola Annotation at same x-coord'
+      } );
+
+      if (graph_initialized) {
+        g.setAnnotations(annotations);
+      }
 
       function add() {
         var x = last_ann + 2;
