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

[dygraphs.git] / tests / zoom.html

diff --git a/tests/zoom.html b/tests/zoom.html
index cba823a..91d3ee4 100644 (file)
--- a/tests/zoom.html
+++ b/tests/zoom.html
@@ -16,8 +16,14 @@
     buttons are useful for testing.</h3>
     <h4>Window coordinates (in dates and values):</h4>
     <div id="xdimensions"></div> <div id="ydimensions"></div>
+    <div style="float: right">
+        <p>Zoomed: <span id="zoomed">False</span><p/>
+        <p>Zoomed X: <span id="zoomedX">False</span><p/>
+        <p>Zoomed Y: <span id="zoomedY">False</span><p/>
+    </div>
     <div id="div_g" style="width:600px; height:300px;"></div>
 
+
     <p><b>Zoom operations:</b></p>
     <p>
       <input type="button" value="Y (3,5)" onclick="zoomGraphY(3,5)">&nbsp;
@@ -40,8 +46,14 @@
             document.getElementById("div_g"),
             NoisyData, {
               errorBars: true,
-             zoomCallback : function(minDate, maxDate, yRanges) {
-                 showDimensions(minDate, maxDate, yRanges); }
+              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");
+              }
             }
           );
 
@@ -56,8 +68,8 @@
       showDimensions(minDate, maxDate, [minValue, maxValue]);
 
       function showDimensions(minDate, maxDate, yRanges) {
-       showXDimensions(minDate, maxDate);
-       showYDimensions(yRanges);
+        showXDimensions(minDate, maxDate);
+        showYDimensions(yRanges);
       }
 
       function showXDimensions(first, second) {
@@ -65,23 +77,23 @@
         elem.innerHTML = "dateWindow : [" + first + ", "+ second + "]";
       }
 
-      function showYDimensions(values) {
+      function showYDimensions(ranges) {
         var elem = document.getElementById("ydimensions");
-        elem.innerHTML = "valueRange : [" + values + "]";
+        elem.innerHTML = "valueRange : [" + ranges + "]";
       }
 
       function zoomGraphX(minDate, maxDate) {
         g.updateOptions({
           dateWindow: [minDate, maxDate]
         });
-           showXDimensions(minDate, maxDate);
+        showXDimensions(minDate, maxDate);
       }
 
       function zoomGraphY(minValue, maxValue) {
         g.updateOptions({
           valueRange: [minValue, maxValue]
         });
-        showYDimensions(this.getYRanges());
+        showYDimensions(g.yAxisRanges());
       }
 
       function unzoomGraph() {