X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=dygraph-utils.js;h=c6c3a60345712b76cd023fa212011b3fb0611c17;hb=6a4457b403f78ba559550f97330ac25ee4d9629f;hp=3103986978f9780458a080ca28f8b1ef0ddf1905;hpb=87cf3e095ae7fd57b6208f8ee910a51d711542e1;p=dygraphs.git

diff --git a/dygraph-utils.js b/dygraph-utils.js
index 3103986..c6c3a60 100644
--- a/dygraph-utils.js
+++ b/dygraph-utils.js
@@ -334,12 +334,15 @@ Dygraph.isOK = function(x) {
 /**
  * @private
  * @param { Object } p The point to consider, valid points are {x, y} objects
+ * @param { Boolean } allowNaNY Treat point with y=NaN as valid
  * @return { Boolean } Whether the point has numeric x and y.
  */
-Dygraph.isValidPoint = function(p) {
+Dygraph.isValidPoint = function(p, allowNaNY) {
   if (!p) return false; // null or undefined object
-  if (isNaN(p.x) || p.x === null || p.x === undefined) return false;
-  if (isNaN(p.y) || p.y === null || p.y === undefined) return false;
+  if (p.yval === null) return false; // missing point
+  if (p.x === null || p.x === undefined) return false;
+  if (p.y === null || p.y === undefined) return false;
+  if (isNaN(p.x) || (!allowNaNY && isNaN(p.y))) return false;
   return true;
 };
 
@@ -491,9 +494,17 @@ Dygraph.dateParser = function(dateStr) {
   var dateStrSlashed;
   var d;
 
-  // Let the system try the format first.
-  d = Dygraph.dateStrToMillis(dateStr);
-  if (d && !isNaN(d)) return d;
+  // Let the system try the format first, with one caveat:
+  // YYYY-MM-DD[ HH:MM:SS] is interpreted as UTC by a variety of browsers.
+  // dygraphs displays dates in local time, so this will result in surprising
+  // inconsistencies. But if you specify "T" or "Z" (i.e. YYYY-MM-DDTHH:MM:SS),
+  // then you probably know what you're doing, so we'll let you go ahead.
+  // Issue: http://code.google.com/p/dygraphs/issues/detail?id=255
+  if (dateStr.search("-") == -1 ||
+      dateStr.search("T") != -1 || dateStr.search("Z") != -1) {
+    d = Dygraph.dateStrToMillis(dateStr);
+    if (d && !isNaN(d)) return d;
+  }
 
   if (dateStr.search("-") != -1) {  // e.g. '2009-7-12' or '2009-07-12'
     dateStrSlashed = dateStr.replace("-", "/", "g");