From: Robert Konigsberg <konigsberg@google.com>
Date: Tue, 4 Jun 2013 21:24:39 +0000 (-0400)
Subject: Merge branch 'master' of https://github.com/danvk/dygraphs
X-Git-Tag: v1.0.0~27
X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=24e420411024c92bc458d10db8aba29f8ca64b73;hp=197b2754b31117cf74d2ed0f54d1ef1a74c298f3;p=dygraphs.git

Merge branch 'master' of https://github.com/danvk/dygraphs
---

diff --git a/dygraph-layout.js b/dygraph-layout.js
index 4b600f7..54496aa 100644
--- a/dygraph-layout.js
+++ b/dygraph-layout.js
@@ -63,7 +63,7 @@ DygraphLayout.prototype.getPlotArea = function() {
 };
 
 // Compute the box which the chart should be drawn in. This is the canvas's
-// box, less space needed for axis and chart labels.
+// box, less space needed for axis, chart labels, and other plug-ins.
 // NOTE: This should only be called by Dygraph.predraw_().
 DygraphLayout.prototype.computePlotArea = function() {
   var area = {
@@ -162,10 +162,6 @@ DygraphLayout.prototype.setYAxes = function (yAxes) {
   this.yAxes_ = yAxes;
 };
 
-DygraphLayout.prototype.setDateWindow = function(dateWindow) {
-  this.dateWindow_ = dateWindow;
-};
-
 DygraphLayout.prototype.evaluate = function() {
   this._evaluateLimits();
   this._evaluateLineCharts();
diff --git a/dygraph.js b/dygraph.js
index 466ce92..bd11c24 100644
--- a/dygraph.js
+++ b/dygraph.js
@@ -2484,7 +2484,6 @@ Dygraph.prototype.drawGraph_ = function() {
   // Save the X axis zoomed status as the updateOptions call will tend to set it erroneously
   var tmp_zoomed_x = this.zoomed_x_;
   // Tell PlotKit to use this new data and render itself
-  this.layout_.setDateWindow(this.dateWindow_);
   this.zoomed_x_ = tmp_zoomed_x;
   this.layout_.evaluateWithError();
   this.renderGraph_(is_initial_draw);