From 44c6bc29a69461e3b25d6e45c1fd00a12266feb5 Mon Sep 17 00:00:00 2001 From: Dan Vanderkam Date: Thu, 21 Oct 2010 23:19:04 -0400 Subject: [PATCH] option to fill in two-axes test --- dygraph-canvas.js | 7 ++++++- tests/steps.html | 3 ++- tests/two-axes.html | 7 +++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dygraph-canvas.js b/dygraph-canvas.js index c12622f..c5c0ee0 100644 --- a/dygraph-canvas.js +++ b/dygraph-canvas.js @@ -320,6 +320,10 @@ DygraphCanvasRenderer = function(dygraph, element, layout, options) { ctx.clip(); }; +DygraphCanvasRenderer.prototype.attr_ = function(x) { + return this.dygraph_.attr_(x); +}; + DygraphCanvasRenderer.prototype.clear = function() { if (this.isIE) { // VML takes a while to start up, so we just poll every this.IEDelay @@ -675,12 +679,13 @@ DygraphCanvasRenderer.prototype._renderAnnotations = function() { * Overrides the CanvasRenderer method to draw error bars */ DygraphCanvasRenderer.prototype._renderLineChart = function() { + // TODO(danvk): use this.attr_ for many of these. var context = this.element.getContext("2d"); var colorCount = this.options.colorScheme.length; var colorScheme = this.options.colorScheme; var fillAlpha = this.options.fillAlpha; var errorBars = this.layout.options.errorBars; - var fillGraph = this.layout.options.fillGraph; + var fillGraph = this.attr_("fillGraph"); var stackedGraph = this.layout.options.stackedGraph; var stepPlot = this.layout.options.stepPlot; diff --git a/tests/steps.html b/tests/steps.html index b8d08c6..9b7aef0 100644 --- a/tests/steps.html +++ b/tests/steps.html @@ -126,7 +126,8 @@ { labels: ["Date","GapSeries1","GapSeries2"], showRoller: true, - stepPlot: true + stepPlot: true, + GapSeries2: { axis: {} } } ); diff --git a/tests/two-axes.html b/tests/two-axes.html index e6b1b6d..78c0fb2 100644 --- a/tests/two-axes.html +++ b/tests/two-axes.html @@ -61,6 +61,13 @@ labelsKMB: true } ); + + function update(el) { + g.updateOptions( { fillGraph: el.checked } ); + g2.updateOptions( { fillGraph: el.checked } ); + } + + -- 2.7.4