From: Neal Nelson <neal@makalumedia.com>
Date: Tue, 7 Dec 2010 13:37:49 +0000 (+0100)
Subject: Merge branch 'master' of http://github.com/danvk/dygraphs
X-Git-Tag: v1.0.0~536^2~1^2~13
X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=a593879d42f14356ba6ff9c213d9d64f32d1714c;p=dygraphs.git

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

Conflicts:
	tests/zoom.html
---

a593879d42f14356ba6ff9c213d9d64f32d1714c
diff --cc dygraph.js
index f63fbc7,1ed103c..40a43c8
--- a/dygraph.js
+++ b/dygraph.js
@@@ -1096,11 -1084,9 +1096,10 @@@ Dygraph.prototype.doZoomX_ = function(l
   */
  Dygraph.prototype.doZoomXDates_ = function(minDate, maxDate) {
    this.dateWindow_ = [minDate, maxDate];
 +  this.zoomed_x_ = true;
    this.drawGraph_();
    if (this.attr_("zoomCallback")) {
-     var yRange = this.yAxisRange();
-     this.attr_("zoomCallback")(minDate, maxDate, yRange[0], yRange[1]);
+     this.attr_("zoomCallback")(minDate, maxDate, this.yAxisRanges());
    }
  };
  
diff --cc tests/zoom.html
index d428d19,10b0457..d37a26d
--- a/tests/zoom.html
+++ b/tests/zoom.html
@@@ -46,13 -40,8 +46,13 @@@
              document.getElementById("div_g"),
              NoisyData, {
                errorBars: true,
-               zoomCallback : function(a,b,c,d) {
-                 showDimensions(a,b,c,d);
+               zoomCallback : function(minDate, maxDate, yRange) {
+                 showDimensions(minDate, maxDate, yRange);
 +              },
 +              drawCallback: function(me, initial) {
 +                document.getElementById("zoomed").innerHTML = "" + me.isZoomed();
 +                document.getElementById("zoomedX").innerHTML = "" + me.isZoomed("x");
 +                document.getElementById("zoomedY").innerHTML = "" + me.isZoomed("y");
                }
              }
            );