X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=tests%2Fcallback.html;h=c6599306c29235e73d80fb6c7fe1e8799b5d2ede;hb=056763ed22ccc5bdebc73355841052d0d6815a1f;hp=6280408479e7985b2d8f9d43772f1c8014f1b5f6;hpb=d37dca408f3689184774e53bfabf3824a263e374;p=dygraphs.git

diff --git a/tests/callback.html b/tests/callback.html
index 6280408..c659930 100644
--- a/tests/callback.html
+++ b/tests/callback.html
@@ -1,13 +1,13 @@
+<!DOCTYPE html>
 <html>
   <head>
     <title>callbacks</title>
-    <!--[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="../dist/dygraph.js"></script>
+
     <script type="text/javascript" src="data.js"></script>
     <style type="text/css">
       #div_g {
@@ -27,12 +27,16 @@
 
     <input type="button" value="Clear list" onclick="javascript:document.getElementById('status').innerHTML=''" />
     <input type="checkbox" id="highlight" checked><label for="highlight"> Show 'highlight' events</label>
+    <input type="checkbox" id="unhighlight" checked><label for="unhighlight">Show 'unhighlight' events</label>
+    <input type="checkbox" id="showLabels" checked
+    onclick='g.updateOptions({showLabelsOnHighlight: this.checked});'>
+    <label for="showLabels"> Show Labels on highlight</label>
     <div id="status" style="width:100%; height:200px;"></div>
 
     <script type="text/javascript">
       s = document.getElementById("status");
       g = null;
-      pts_info = function(e, x, pts) {
+      pts_info = function(e, x, pts, row) {
         var str = "(" + x + ") ";
         for (var i = 0; i < pts.length; i++) {
           var p = pts[i];
@@ -45,6 +49,7 @@
         var dataXY = g.toDataCoords(x, y);
         str += ", (" + x + ", " + y + ")";
         str += " -> (" + dataXY[0] + ", " + dataXY[1] + ")";
+        str += ", row #"+row;
 
         return str;
       };
@@ -56,9 +61,15 @@
               showRoller: true,
               errorBars: true,
 
-              highlightCallback: function(e, x, pts) {
+              highlightCallback: function(e, x, pts, row) {
                 if (document.getElementById('highlight').checked) {
-                  s.innerHTML += "<b>Highlight</b> " + pts_info(e,x,pts) + "<br/>";
+                  s.innerHTML += "<b>Highlight</b> " + pts_info(e,x,pts,row) + "<br/>";
+                }
+              },
+
+              unhighlightCallback: function(e) {
+                if (document.getElementById('unhighlight').checked) {
+                  s.innerHTML += "<b>Unhighlight</b><br/>";
                 }
               },
 
@@ -66,8 +77,12 @@
                 s.innerHTML += "<b>Click</b> " + pts_info(e,x,pts) + "<br/>";
               },
 
-              zoomCallback: function(minX, maxX) {
-                s.innerHTML += "<b>Zoom</b> [" + minX + ", " + maxX + "]<br/>";
+              pointClickCallback: function(e, p) {
+                s.innerHTML += "<b>Point Click</b> " + p.name + ": " + p.x + "<br/>";
+              },
+
+              zoomCallback: function(minX, maxX, yRanges) {
+                s.innerHTML += "<b>Zoom</b> [" + minX + ", " + maxX + ", [" + yRanges + "]]<br/>";
               },
 
               drawCallback: function(g) {
