X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=dygraph-canvas.js;h=f463e3955e03115237815233260a840a9a62ce35;hb=7aedf6fee4cad9a3fc6de49476fc176e48a090fa;hp=9b70f81858875c2616600ddcd476317e2078160d;hpb=d03e78ed03fbe85b86c67bbd0240248a80621e8b;p=dygraphs.git

diff --git a/dygraph-canvas.js b/dygraph-canvas.js
index 9b70f81..f463e39 100644
--- a/dygraph-canvas.js
+++ b/dygraph-canvas.js
@@ -32,9 +32,9 @@ DygraphLayout.prototype.addDataset = function(setname, set_xy) {
 
 DygraphLayout.prototype.setAnnotations = function(ann) {
   // The Dygraph object's annotations aren't parsed. We parse them here and
-  // save a copy.
+  // save a copy. If there is no parser, then the user must be using raw format.
   this.annotations = [];
-  var parse = this.attr_('xValueParser');
+  var parse = this.attr_('xValueParser') || function(x) { return x; };
   for (var i = 0; i < ann.length; i++) {
     var a = {};
     if (!ann[i].xval && !ann[i].x) {
@@ -89,11 +89,14 @@ DygraphLayout.prototype._evaluateLimits = function() {
     axis.yrange = axis.maxyval - axis.minyval;
     axis.yscale = (axis.yrange != 0 ? 1.0 / axis.yrange : 1.0);
 
-    axis.ylogrange = Dygraph.log10(axis.maxyval) - Dygraph.log10(axis.minyval);
-    axis.ylogscale = (axis.ylogrange != 0 ? 1.0 / axis.ylogrange : 1.0);
-    if (axis.g.attr_("logscale") && isNaN(axis.ylogrange)) {
-      axis.g.error('axis ' + i + ' can\'t be displayed in log scale for range [' +
-          axis.minyval + ' - ' + axis.maxyval + ']');
+    if (axis.g.attr_("logscale")) {
+      axis.ylogrange = Dygraph.log10(axis.maxyval) - Dygraph.log10(axis.minyval);
+      axis.ylogscale = (axis.ylogrange != 0 ? 1.0 / axis.ylogrange : 1.0);
+      if (!isFinite(axis.ylogrange) || isNaN(axis.ylogrange)) {
+        axis.g.error('axis ' + i + ' of graph at ' + axis.g +
+            ' can\'t be displayed in log scale for range [' +
+            axis.minyval + ' - ' + axis.maxyval + ']');
+      }
     }
   }
 };