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) {
}
// create paths
- var isOK = function(x) { return x && !isNaN(x); };
-
var ctx = context;
if (errorBars) {
if (fillGraph) {
for (var j = 0; j < this.layout.points.length; j++) {
var point = this.layout.points[j];
if (point.name == setName) {
- if (!isOK(point.y)) {
+ if (!Dygraph.isOK(point.y)) {
prevX = NaN;
continue;
}
for (var j = 0; j < this.layout.points.length; j++) {
var point = this.layout.points[j];
if (point.name == setName) {
- if (!isOK(point.y)) {
+ if (!Dygraph.isOK(point.y)) {
prevX = NaN;
continue;
}
for (var j = 0; j < points.length; j++) {
var point = points[j];
if (point.name == setName) {
- if (!isOK(point.canvasy)) {
+ if (!Dygraph.isOK(point.canvasy)) {
if (stepPlot && prevX != null) {
// Draw a horizontal line to the start of the missing data
ctx.beginPath();
// A point is "isolated" if it is non-null but both the previous
// and next points are null.
var isIsolated = (!prevX && (j == points.length - 1 ||
- !isOK(points[j+1].canvasy)));
+ !Dygraph.isOK(points[j+1].canvasy)));
if (!prevX) {
prevX = point.canvasx;