From: Robert Konigsberg <konigsberg@google.com>
Date: Tue, 9 Nov 2010 23:59:02 +0000 (-0500)
Subject: Merge branch 'master' of http://github.com/danvk/dygraphs
X-Git-Tag: v1.0.0~613^2
X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=3a8dc464e8e7b197d7df18220ab2ad189ff95841;hp=22186871014d5f553af00d46d6720b40a1d66f07;p=dygraphs.git

Merge branch 'master' of github.com/danvk/dygraphs
---

diff --git a/dygraph.js b/dygraph.js
index 32d1e0d..f736a7e 100644
--- a/dygraph.js
+++ b/dygraph.js
@@ -1160,6 +1160,8 @@ Dygraph.prototype.mouseMove_ = function(event) {
   var minDist = 1e+100;
   var idx = -1;
   for (var i = 0; i < points.length; i++) {
+    var point = points[i];
+    if (point == null) continue;
     var dist = Math.abs(points[i].canvasx - canvasx);
     if (dist > minDist) continue;
     minDist = dist;
@@ -1167,7 +1169,8 @@ Dygraph.prototype.mouseMove_ = function(event) {
   }
   if (idx >= 0) lastx = points[idx].xval;
   // Check that you can really highlight the last day's data
-  if (canvasx > points[points.length-1].canvasx)
+  var last = points[points.length-1];
+  if (last != null && canvasx > last.canvasx)
     lastx = points[points.length-1].xval;
 
   // Extract the points we've selected