From: Neal Nelson <neal@makalumedia.com>
Date: Mon, 31 Jan 2011 13:08:52 +0000 (+0100)
Subject: Merge branch 'master' of http://github.com/danvk/dygraphs
X-Git-Tag: v1.0.0~536^2~1^2~6
X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=90e29a7415fdbb87d6df022c0115566d52373d2a;p=dygraphs.git

Merge branch 'master' of github.com/danvk/dygraphs

Conflicts:
	dygraph.js
---

90e29a7415fdbb87d6df022c0115566d52373d2a
diff --cc dygraph.js
index b4f73c9,0989a1d..646159a
--- a/dygraph.js
+++ b/dygraph.js
@@@ -2142,16 -2117,7 +2138,16 @@@ Dygraph.prototype.drawGraph_ = function
   *   indices are into the axes_ array.
   */
  Dygraph.prototype.computeYAxes_ = function() {
 +  var valueWindows;
 +  if (this.axes_ != undefined) {
 +    // Preserve valueWindow settings.
 +    valueWindows = [];
 +    for (var index = 0; index < this.axes_.length; index++) {
 +      valueWindows.push(this.axes_[index].valueWindow);
 +    }
 +  }
 +
-   this.axes_ = [{}];  // always have at least one y-axis.
+   this.axes_ = [{ yAxisId: 0 }];  // always have at least one y-axis.
    this.seriesToAxisMap_ = {};
  
    // Get a list of series names.