X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=src%2Fdygraph-canvas.js;h=bd37e67e02c5eabf7faf5e0ffb78a3f10cb0c4e1;hb=b55a71d768d2f8de62877c32b3aec9e9975ac389;hp=256edc13a0e4c597ddfe77a42eaf79c521d20cd8;hpb=6ecc073934b76e5076f917112a24ff7094857730;p=dygraphs.git diff --git a/src/dygraph-canvas.js b/src/dygraph-canvas.js index 256edc1..bd37e67 100644 --- a/src/dygraph-canvas.js +++ b/src/dygraph-canvas.js @@ -28,6 +28,7 @@ "use strict"; import * as utils from './dygraph-utils'; +import Dygraph from './dygraph'; /** @@ -153,7 +154,7 @@ DygraphCanvasRenderer._drawStyledLine = function(e, var ctx = e.drawingContext; ctx.save(); if (stroking) { - ctx.installPattern(strokePattern); + if (ctx.setLineDash) ctx.setLineDash(strokePattern); } var pointsOnLine = DygraphCanvasRenderer._drawSeries( @@ -162,7 +163,7 @@ DygraphCanvasRenderer._drawStyledLine = function(e, e, pointsOnLine, drawPointCallback, color, pointSize); if (stroking) { - ctx.uninstallPattern(); + if (ctx.setLineDash) ctx.setLineDash([]); } ctx.restore(); @@ -219,18 +220,18 @@ DygraphCanvasRenderer._drawSeries = function(e, prevCanvasX = prevCanvasY = null; } else { isIsolated = false; - if (drawGapPoints || !prevCanvasX) { + if (drawGapPoints || prevCanvasX === null) { iter.nextIdx_ = i; iter.next(); nextCanvasY = iter.hasNext ? iter.peek.canvasy : null; var isNextCanvasYNullOrNaN = nextCanvasY === null || nextCanvasY != nextCanvasY; - isIsolated = (!prevCanvasX && isNextCanvasYNullOrNaN); + isIsolated = (prevCanvasX === null && isNextCanvasYNullOrNaN); if (drawGapPoints) { // Also consider a point to be "isolated" if it's adjacent to a // null point, excluding the graph edges. - if ((!first && !prevCanvasX) || + if ((!first && prevCanvasX === null) || (iter.hasNext && isNextCanvasYNullOrNaN)) { isIsolated = true; }