From: Dan Vanderkam <danvk@google.com>
Date: Tue, 21 Dec 2010 18:46:40 +0000 (-0500)
Subject: Merge branch 'master' of https://github.com/kberg/dygraphs
X-Git-Tag: v1.0.0~593^2~4
X-Git-Url: https://adrianiainlam.tk/git/?a=commitdiff_plain;h=808d7ac8166f61f2d34c6456bada237bd2511a80;hp=5f70132fa774bb546e45b0acbb7a929763c68913;p=dygraphs.git

Merge branch 'master' of https://github.com/kberg/dygraphs
---

diff --git a/tests/interaction.html b/tests/interaction.html
index 082a54e..d768dd6 100644
--- a/tests/interaction.html
+++ b/tests/interaction.html
@@ -30,7 +30,8 @@
     </td><td>
     Zoom in: double-click, scroll wheel<br/>
     Zoom out: ctrl-double-click, scroll wheel<br/>
-    Pan: click-drag<br/>
+    Standard Zoom: shift-click-drag
+    Standard Pan: click-drag<br/>
     Restore zoom level: press button<br/>
     </td></tr>
     <tr><td>
@@ -42,22 +43,30 @@
     </td></tr>
 
     </table>
-
+        
     <script type="text/javascript">
       function downV3(event, g, context) {
         context.initializeMouseDown(event, g, context);
-        Dygraph.startPan(event, g, context);
+        if (event.altKey || event.shiftKey) {
+          Dygraph.startZoom(event, g, context);
+        } else {
+          Dygraph.startPan(event, g, context);
+        }
       }
 
       function moveV3(event, g, context) {
         if (context.isPanning) {
           Dygraph.movePan(event, g, context);
+        } else if (context.isZooming) {
+          Dygraph.moveZoom(event, g, context);
         }
       }
 
       function upV3(event, g, context) {
         if (context.isPanning) {
           Dygraph.endPan(event, g, context);
+        } else if (context.isZooming) {
+          Dygraph.endZoom(event, g, context);
         }
       }
 
diff --git a/tests/zoom.html b/tests/zoom.html
index 2f0cf98..ad0bc9d 100644
--- a/tests/zoom.html
+++ b/tests/zoom.html
@@ -41,8 +41,8 @@
             NoisyData, {
               errorBars: true,
               zoomCallback : function(minDate, maxDate, yRanges) {
-	        showDimensions(minDate, maxDate, yRanges);
-	      }
+                showDimensions(minDate, maxDate, yRanges);
+              }
             }
           );