From: Robert Konigsberg <konigsberg@google.com>
Date: Mon, 29 Nov 2010 22:16:30 +0000 (-0500)
Subject: Merge branch 'master' of http://github.com/kberg/dygraphs
X-Git-Tag: v1.0.0~584^2~27
X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=5f3b823b04c883763db7532e131f81e79f032f96;p=dygraphs.git

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

Conflicts:
	dygraph.js
	tests/zoom.html
---

5f3b823b04c883763db7532e131f81e79f032f96
diff --cc tests/zoom.html
index cba823a,10b0457..1b60936
--- a/tests/zoom.html
+++ b/tests/zoom.html
@@@ -40,8 -40,9 +40,9 @@@
              document.getElementById("div_g"),
              NoisyData, {
                errorBars: true,
 -              zoomCallback : function(minDate, maxDate, yRange) {
 -                showDimensions(minDate, maxDate, yRange);
 +	      zoomCallback : function(minDate, maxDate, yRanges) {
 +	          showDimensions(minDate, maxDate, yRanges); }
+               }
              }
            );
  
@@@ -65,9 -65,9 +66,9 @@@
          elem.innerHTML = "dateWindow : [" + first + ", "+ second + "]";
        }
  
-       function showYDimensions(values) {
 -      function showYDimensions(range) {
++      function showYDimensions(ranges) {
          var elem = document.getElementById("ydimensions");
-         elem.innerHTML = "valueRange : [" + values + "]";
 -        elem.innerHTML = "valueRange : [" + range + "]";
++        elem.innerHTML = "valueRange : [" + ranges + "]";
        }
  
        function zoomGraphX(minDate, maxDate) {