X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=dygraph-canvas.js;h=11affc22e426a9eaa64a5b7bcc465f821fc47253;hb=68f9bed30349ea126921490f2631dc30a404d092;hp=45d27affd51acb2d8b82fbf0f4d184b7ecaaeb80;hpb=ae85914a82c8c9537b6a1c75f937565024e76d9b;p=dygraphs.git diff --git a/dygraph-canvas.js b/dygraph-canvas.js index 45d27af..11affc2 100644 --- a/dygraph-canvas.js +++ b/dygraph-canvas.js @@ -17,7 +17,7 @@ DygraphLayout = function(dygraph, options) { this.dygraph_ = dygraph; this.options = {}; // TODO(danvk): remove, use attr_ instead. - MochiKit.Base.update(this.options, options ? options : {}); + Dygraph.update(this.options, options ? options : {}); this.datasets = new Array(); }; @@ -146,7 +146,7 @@ DygraphLayout.prototype.removeAllDatasets = function() { * @param {Object} new_options an associative array of new properties */ DygraphLayout.prototype.updateOptions = function(new_options) { - MochiKit.Base.update(this.options, new_options ? new_options : {}); + Dygraph.update(this.options, new_options ? new_options : {}); }; // Subclass PlotKit.CanvasRenderer to add: @@ -179,23 +179,12 @@ DygraphCanvasRenderer = function(dygraph, element, layout, options) { "drawXGrid": true, "gridLineColor": "rgb(128,128,128)" }; - MochiKit.Base.update(this.options, options); + Dygraph.update(this.options, options); this.layout = layout; this.element = element; this.container = this.element.parentNode; - // Stuff relating to Canvas on IE support - this.isIE = (/MSIE/.test(navigator.userAgent) && !window.opera); - - if (this.isIE && !isNil(G_vmlCanvasManager)) { - this.IEDelay = 0.5; - this.maxTries = 5; - this.renderDelay = null; - this.clearDelay = null; - this.element = G_vmlCanvasManager.initElement(this.element); - } - this.height = this.element.height; this.width = this.element.width; @@ -548,7 +537,8 @@ DygraphCanvasRenderer.prototype._renderLineChart = function() { if (drawPoints || isIsolated) { ctx.beginPath(); ctx.fillStyle = color; - ctx.arc(point.canvasx, point.canvasy, pointSize, 0, 360, false); + ctx.arc(point.canvasx, point.canvasy, pointSize, + 0, 2 * Math.PI, false); ctx.fill(); } }