From: Dan Vanderkam <danvdk@gmail.com>
Date: Thu, 29 Aug 2013 23:19:58 +0000 (-0400)
Subject: merge
X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=19110acbea2ec5d21ba3246cb593b0c140397a36;p=dygraphs.git

merge
---

19110acbea2ec5d21ba3246cb593b0c140397a36
diff --cc dygraph.js
index 1bfe873,effe10d..6fa21e8
--- a/dygraph.js
+++ b/dygraph.js
@@@ -885,11 -854,10 +885,11 @@@ Dygraph.prototype.toDataYCoord = functi
    }
  
    var area = this.plotter_.area;
 -  var yRange = this.yAxisRange(axis);
 +  var yRange = this.yAxisRange(opt_axis);
 +
 +  var axis = opt_axis || 0;
  
-   if (!this.axes_[axis].logscale) {
 -  if (typeof(axis) == "undefined") axis = 0;
+   if (!this.attributes_.getForAxis("logscale", axis)) {
      return yRange[0] + (area.y + area.h - y) / area.h * (yRange[1] - yRange[0]);
    } else {
      // Computing the inverse of toDomCoord.