From 7e64db422edd4fb5ce6b5abfb668d23ec9d001b8 Mon Sep 17 00:00:00 2001 From: Robert Konigsberg Date: Sun, 15 Sep 2013 15:58:06 -0400 Subject: [PATCH] Nit comment resolution for pull request 271 (making connectSeparatedPoints per-series aware.) --- dygraph-layout.js | 10 +++++----- dygraph.js | 4 ++-- tests/connect-separated.html | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dygraph-layout.js b/dygraph-layout.js index 2552f7f..315d8e6 100644 --- a/dygraph-layout.js +++ b/dygraph-layout.js @@ -84,7 +84,7 @@ DygraphLayout.prototype.computePlotArea = function() { y: 0 }; - area.w = this.dygraph_.width_ - area.x - this.dygraph_.attr_('rightGap'); + area.w = this.dygraph_.width_ - area.x - this.dygraph_.getOption('rightGap'); area.h = this.dygraph_.height_; // Let plugins reserve space. @@ -145,7 +145,7 @@ DygraphLayout.prototype.setAnnotations = function(ann) { // The Dygraph object's annotations aren't parsed. We parse them here and // save a copy. If there is no parser, then the user must be using raw format. this.annotations = []; - var parse = this.dygraph_.attr_('xValueParser') || function(x) { return x; }; + var parse = this.dygraph_.getOption('xValueParser') || function(x) { return x; }; for (var i = 0; i < ann.length; i++) { var a = {}; if (!ann[i].xval && ann[i].x === undefined) { @@ -195,7 +195,7 @@ DygraphLayout.prototype._evaluateLimits = function() { axis.yrange = axis.maxyval - axis.minyval; axis.yscale = (axis.yrange !== 0 ? 1.0 / axis.yrange : 1.0); - if (axis.g.attr_("logscale")) { + if (axis.g.getOption("logscale")) { axis.ylogrange = Dygraph.log10(axis.maxyval) - Dygraph.log10(axis.minyval); axis.ylogscale = (axis.ylogrange !== 0 ? 1.0 / axis.ylogrange : 1.0); if (!isFinite(axis.ylogrange) || isNaN(axis.ylogrange)) { @@ -216,12 +216,12 @@ DygraphLayout._calcYNormal = function(axis, value, logscale) { }; DygraphLayout.prototype._evaluateLineCharts = function() { - var isStacked = this.dygraph_.attr_("stackedGraph"); + var isStacked = this.dygraph_.getOption("stackedGraph"); for (var setIdx = 0; setIdx < this.points.length; setIdx++) { var points = this.points[setIdx]; var setName = this.setNames[setIdx]; - var connectSeparated = this.dygraph_.attr_('connectSeparatedPoints', setName); + var connectSeparated = this.dygraph_.getOption('connectSeparatedPoints', setName); var axis = this.dygraph_.axisPropertiesForSeries(setName); // TODO (konigsberg): use optionsForAxis instead. var logscale = this.dygraph_.attributes_.getForSeries("logscale", setName); diff --git a/dygraph.js b/dygraph.js index 6d970bb..184ec11 100644 --- a/dygraph.js +++ b/dygraph.js @@ -3510,8 +3510,8 @@ Dygraph.prototype.visibility = function() { /** * Changes the visiblity of a series. * - * @param {Number} num the series index - * @param {Boolean} value true or false, identifying the visibility. + * @param {number} num the series index + * @param {boolean} value true or false, identifying the visibility. */ Dygraph.prototype.setVisibility = function(num, value) { var x = this.visibility(); diff --git a/tests/connect-separated.html b/tests/connect-separated.html index a5e708f..e7e562b 100644 --- a/tests/connect-separated.html +++ b/tests/connect-separated.html @@ -51,7 +51,7 @@ var nextVal = values[nextIdx]; el.textContent = textSequences[nextIdx]; - if (el.id == "All") { + if (el.id == "All") { g.updateOptions({ connectSeparatedPoints : nextVal }); } else { var seriesOpt = {}; -- 2.7.4