Merge branch 'auto-tests' of https://github.com/kberg/dygraphs into auto-tests

[dygraphs.git] / dygraph-layout.js

diff --git a/dygraph-layout.js b/dygraph-layout.js
index b67fe2c..4b600f7 100644 (file)
--- a/dygraph-layout.js
+++ b/dygraph-layout.js
@@ -52,6 +52,12 @@ DygraphLayout.prototype.addDataset = function(setname, set_xy) {
   this.setNames.push(setname);
 };
 
+/**
+ * Returns the box which the chart should be drawn in. This is the canvas's
+ * box, less space needed for the axis and chart labels.
+ *
+ * @return {{x: number, y: number, w: number, h: number}}
+ */
 DygraphLayout.prototype.getPlotArea = function() {
   return this.area_;
 };
@@ -211,6 +217,7 @@ DygraphLayout.prototype._evaluateLineCharts = function() {
   // on chrome+linux, they are 6 times more expensive than iterating through the
   // points and drawing the lines. The brunt of the cost comes from allocating
   // the |point| structures.
+  var boundaryIdStart = this.dygraph_.getLeftBoundary_();
   for (var setIdx = 0; setIdx < this.datasets.length; setIdx++) {
     var dataset = this.datasets[setIdx];
     var setName = this.setNames[setIdx];
@@ -243,7 +250,7 @@ DygraphLayout.prototype._evaluateLineCharts = function() {
         xval: xValue,
         yval: yValue,
         name: setName,  // TODO(danvk): is this really necessary?
-        idx: j + this.dygraph_.boundaryIds_[setIdx][0]
+        idx: j + boundaryIdStart
       };
     }