From eb0da59f0c6983b201d0479f02f3c871ebb8324e Mon Sep 17 00:00:00 2001 From: Robert Konigsberg Date: Sat, 17 Nov 2012 20:44:43 -0600 Subject: [PATCH] Respect options set in the series-axis object (e.g. Y2 : { labelsKMB: true }) --- dygraph-options.js | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dygraph-options.js b/dygraph-options.js index 95c1525..9227870 100644 --- a/dygraph-options.js +++ b/dygraph-options.js @@ -45,6 +45,9 @@ var DygraphOptions = function(dygraph) { DygraphOptions.prototype.reparseSeries = function() { this.labels = this.find("labels").slice(1); + this.axes = [ {} ]; // Always one axis at least. + this.series = {}; + var axisId = 0; // 0-offset; there's always one. // Go through once, add all the series, and for those with {} axis options, add a new axis. for (var idx = 0; idx < this.labels.length; idx++) { @@ -56,6 +59,7 @@ DygraphOptions.prototype.reparseSeries = function() { var axis = optionsForSeries["axis"]; if (typeof(axis) == 'object') { yAxis = ++axisId; + this.axes[yAxis] = axis; } this.series[seriesName] = { idx: idx, yAxis: yAxis, options : optionsForSeries }; } @@ -82,10 +86,14 @@ DygraphOptions.prototype.reparseSeries = function() { if (this.global_user.hasOwnProperty("axes")) { var axis_opts = this.global_user.axes; - this.axes.push(axis_opts["y"] || {}); - this.axes.push(axis_opts["y2"] || {}); - } else { - this.axes.push({}); // There has to be at least one axis. + if (axis_opts.hasOwnProperty("y")) { + Dygraph.update(this.axes[0], axis_opts.y); + } + + if (axis_opts.hasOwnProperty("y2")) { + this.axes[1] = this.axes[1] || {}; + Dygraph.update(this.axes[1], axis_opts.y2); + } } }; -- 2.7.4