X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=dygraph-layout.js;h=2552f7f8fa006c3748b6166596826a11e6bc301c;hb=b85358e2c7dc73ec1179feb17b9060e132fcdbec;hp=93e0c3abc49b89495d5e7fa4fcb5a57919192fa1;hpb=a49c164ae4b251553a87517ef7d1dc57f3f2ad4c;p=dygraphs.git diff --git a/dygraph-layout.js b/dygraph-layout.js index 93e0c3a..2552f7f 100644 --- a/dygraph-layout.js +++ b/dygraph-layout.js @@ -53,10 +53,6 @@ var DygraphLayout = function(dygraph) { this.yTicks_ = null; }; -DygraphLayout.prototype.attr_ = function(name) { - return this.dygraph_.attr_(name); -}; - /** * Add points for a single series. * @@ -88,7 +84,7 @@ DygraphLayout.prototype.computePlotArea = function() { y: 0 }; - area.w = this.dygraph_.width_ - area.x - this.attr_('rightGap'); + area.w = this.dygraph_.width_ - area.x - this.dygraph_.attr_('rightGap'); area.h = this.dygraph_.height_; // Let plugins reserve space. @@ -149,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.attr_('xValueParser') || function(x) { return x; }; + var parse = this.dygraph_.attr_('xValueParser') || function(x) { return x; }; for (var i = 0; i < ann.length; i++) { var a = {}; if (!ann[i].xval && ann[i].x === undefined) { @@ -220,12 +216,12 @@ DygraphLayout._calcYNormal = function(axis, value, logscale) { }; DygraphLayout.prototype._evaluateLineCharts = function() { - var connectSeparated = this.attr_('connectSeparatedPoints'); - var isStacked = this.attr_("stackedGraph"); + var isStacked = this.dygraph_.attr_("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 axis = this.dygraph_.axisPropertiesForSeries(setName); // TODO (konigsberg): use optionsForAxis instead. var logscale = this.dygraph_.attributes_.getForSeries("logscale", setName);