X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=dygraph.js;h=1d97bda83db91ba67d2f65a692ccb97464e3c353;hb=5469113bc1d7bb38c9214e709c87598b7f6ef256;hp=616dfe96b23a61602c139ca32fea7b0a5bed24b8;hpb=475f7420e0ec216995edb9db860a005273a97894;p=dygraphs.git diff --git a/dygraph.js b/dygraph.js index 616dfe9..1d97bda 100644 --- a/dygraph.js +++ b/dygraph.js @@ -1620,13 +1620,6 @@ Dygraph.prototype.mouseMove_ = function(event) { var canvasx = canvasCoords[0]; var canvasy = canvasCoords[1]; - var mouseoverCallback = this.attr_("mouseoverCallback"); - if (mouseoverCallback) { - var highlightRow = this.idxToRow_(idx); - var ret = mouseoverCallback(this, event); - if (ret) return; - } - var highlightSeriesOpts = this.attr_("highlightSeriesOpts"); var selectionChanged = false; if (highlightSeriesOpts) { @@ -1897,8 +1890,6 @@ Dygraph.prototype.updateSelection_ = function(opt_animFraction) { ctx.fillRect(0, 0, this.width_, this.height_); } var setIdx = this.datasetIndexFromSetName_(this.highlightSet_); - var underlay = this.attr_('highlightUnderlay'); - if (underlay) underlay(this, ctx, setIdx); this.plotter_._drawLine(ctx, setIdx); } else if (this.previousVerticalX_ >= 0) { // Determine the maximum highlight circle size. @@ -1931,10 +1922,12 @@ Dygraph.prototype.updateSelection_ = function(opt_animFraction) { if (!Dygraph.isOK(pt.canvasy)) continue; var circleSize = this.attr_('highlightCircleSize', pt.name); - ctx.beginPath(); - ctx.fillStyle = this.plotter_.colors[pt.name]; - ctx.arc(canvasx, pt.canvasy, circleSize, 0, 2 * Math.PI, false); - ctx.fill(); + var callback = this.attr_("drawHighlightPointCallback", pt.name); + if (!callback) { + callback = Dygraph.Circles.DEFAULT; + } + callback(this.g, pt.name, ctx, canvasx, pt.canvasy, + this.plotter_.colors[pt.name], circleSize); } ctx.restore();