From: Dan Vanderkam <dan@dygraphs.com>
Date: Tue, 28 Jun 2011 14:59:07 +0000 (-0700)
Subject: Merge pull request #69 from kberg/master
X-Git-Tag: v1.0.0~457
X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=ce691288760cec716481818701da85793c014971;hp=a307700238038a375a5fcc4ca2553685debb4e6f;p=dygraphs.git

Merge pull request #69 from kberg/master

Fix 203 for real. It was just a bad test.
---

diff --git a/docs/changes.html b/docs/changes.html
index 9d7bb90..b12cc26 100644
--- a/docs/changes.html
+++ b/docs/changes.html
@@ -2,7 +2,7 @@
 <html>
   <head>
     <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7; IE=EmulateIE9">
-    <title>dygraphs input types</title>
+    <title>Guide to making dygraphs changes</title>
     <style type="text/css">
       code { white-space: pre; border: 1px dashed black; display: inline; }
       pre  { white-space: pre; border: 1px dashed black; }
diff --git a/dygraph-layout.js b/dygraph-layout.js
index 9c70965..99ae50c 100644
--- a/dygraph-layout.js
+++ b/dygraph-layout.js
@@ -222,6 +222,13 @@ DygraphLayout.prototype._evaluateAnnotations = function() {
   }
 
   this.annotated_points = [];
+
+  // Exit the function early if there are no annotations.
+  if (!this.annotations || !this.annotations.length) {
+    return;
+  }
+  
+  // TODO(antrob): loop through annotations not points.
   for (var i = 0; i < this.points.length; i++) {
     var p = this.points[i];
     var k = p.xval + "," + p.name;
diff --git a/dygraph-options-reference.js b/dygraph-options-reference.js
index 8709ffa..5bc7f63 100644
--- a/dygraph-options-reference.js
+++ b/dygraph-options-reference.js
@@ -352,12 +352,11 @@ Dygraph.OPTIONS_REFERENCE =  // <JSON>
     "description": "Function to call to format values along the x axis."
   },
   "clickCallback": {
-    "snippet": "function(e, date){<br>&nbsp;&nbsp;alert(date);<br>}",
+    "snippet": "function(e, date_millis){<br>&nbsp;&nbsp;alert(new Date(date_millis));<br>}",
     "default": "null",
     "labels": ["Callbacks"],
-    "type": "function(e, date, points)",
-    // NOTE(konigsberg): Is this description correct?
-    "description": "A function to call when the canvas is clicked. The function should take three arguments, the event object for the click, the date that was clicked, and the closest points along that date. The points have these properties:\n * xval/yval: The data coordinates of the point (with dates/times as millis since epoch) \n * canvasx/canvasy: The canvas coordinates at which the point is drawn. \n name: The name of the data series to which the point belongs"
+    "type": "function(e, x, points)",
+    "description": "A function to call when the canvas is clicked. The function should take three arguments, the event object for the click, the x-value that was clicked (for dates this is millis since epoch), and the closest points along that date. The points have these properties:\n * xval/yval: The data coordinates of the point (with dates/times as millis since epoch) \n * canvasx/canvasy: The canvas coordinates at which the point is drawn. \n name: The name of the data series to which the point belongs"
   },
   "yAxisLabelFormatter": {
     "default": "yValueFormatter",
diff --git a/tests/dygraph-many-points-benchmark.html b/tests/dygraph-many-points-benchmark.html
index 2919706..b4f7471 100644
--- a/tests/dygraph-many-points-benchmark.html
+++ b/tests/dygraph-many-points-benchmark.html
@@ -82,8 +82,13 @@
           document.getElementById('message').innerHTML =
               "completed in " + (end - start) + " milliseconds.";
         } else {
+          var avg = 0;
+          for (var i = 0; i < millisecondss.length; i++) {
+            avg+=millisecondss[i];
+          }
+          avg/=millisecondss.length; 
           document.getElementById('message').innerHTML =
-              "Durations: " + millisecondss;
+              "Durations: " + millisecondss + " Average: " + avg;
         }
 
         if (durations.length > 0) {
