X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=dygraph-interaction-model.js;h=4df67997104dd81e9f37950deb234488c970dbaf;hb=787a3d68b7e385c4229afe2b224a8b90c3dc551d;hp=27906332670ee08b3f6da58fa0933ac92323ba8f;hpb=6125fedf574a2916c5c48bc711da86984ed13a6f;p=dygraphs.git

diff --git a/dygraph-interaction-model.js b/dygraph-interaction-model.js
index 2790633..4df6799 100644
--- a/dygraph-interaction-model.js
+++ b/dygraph-interaction-model.js
@@ -220,6 +220,7 @@ Dygraph.Interaction.endPan = function(event, g, context) {
  */
 Dygraph.Interaction.startZoom = function(event, g, context) {
   context.isZooming = true;
+  context.zoomMoved = false;
 };
 
 /**
@@ -236,6 +237,7 @@ Dygraph.Interaction.startZoom = function(event, g, context) {
  * dragStartX/dragStartY/etc. properties). This function modifies the context.
  */
 Dygraph.Interaction.moveZoom = function(event, g, context) {
+  context.zoomMoved = true;
   context.dragEndX = g.dragGetX_(event, context);
   context.dragEndY = g.dragGetY_(event, context);
 
@@ -329,11 +331,13 @@ Dygraph.Interaction.endZoom = function(event, g, context) {
   if (regionWidth >= 10 && context.dragDirection == Dygraph.HORIZONTAL) {
     g.doZoomX_(Math.min(context.dragStartX, context.dragEndX),
                Math.max(context.dragStartX, context.dragEndX));
+    context.cancelNextDblclick = true;
   } else if (regionHeight >= 10 && context.dragDirection == Dygraph.VERTICAL) {
     g.doZoomY_(Math.min(context.dragStartY, context.dragEndY),
                Math.max(context.dragStartY, context.dragEndY));
+    context.cancelNextDblclick = true;
   } else {
-    g.clearZoomRect_();
+    if (context.zoomMoved) g.clearZoomRect_();
   }
   context.dragStartX = null;
   context.dragStartY = null;
@@ -372,7 +376,7 @@ Dygraph.Interaction.startTouch = function(event, g, context) {
 
       // TODO(danvk): remove
       dataX: 0.5 * (touches[0].dataX + touches[1].dataX),
-      dataY: 0.5 * (touches[0].dataY + touches[1].dataY),
+      dataY: 0.5 * (touches[0].dataY + touches[1].dataY)
     };
 
     // Make pinches in a 45-degree swath around either axis 1-dimensional zooms.
@@ -401,12 +405,12 @@ Dygraph.Interaction.startTouch = function(event, g, context) {
  * @private
  */
 Dygraph.Interaction.moveTouch = function(event, g, context) {
-  var touches = [];
-  for (var i = 0; i < event.touches.length; i++) {
+  var i, touches = [];
+  for (i = 0; i < event.touches.length; i++) {
     var t = event.touches[i];
     touches.push({
       pageX: t.pageX,
-      pageY: t.pageY,
+      pageY: t.pageY
     });
   }
   var initialTouches = context.initialTouches;
@@ -428,7 +432,7 @@ Dygraph.Interaction.moveTouch = function(event, g, context) {
   // we toss it out for now, but could use it in the future.
   var swipe = {
     pageX: c_now.pageX - c_init.pageX,
-    pageY: c_now.pageY - c_init.pageY,
+    pageY: c_now.pageY - c_init.pageY
   };
   var dataWidth = context.initialRange.x[1] - context.initialRange.x[0];
   var dataHeight = context.initialRange.y[0] - context.initialRange.y[1];
@@ -456,19 +460,19 @@ Dygraph.Interaction.moveTouch = function(event, g, context) {
   if (context.touchDirections.x) {
     g.dateWindow_ = [
       c_init.dataX - swipe.dataX + (context.initialRange.x[0] - c_init.dataX) / xScale,
-      c_init.dataX - swipe.dataX + (context.initialRange.x[1] - c_init.dataX) / xScale,
+      c_init.dataX - swipe.dataX + (context.initialRange.x[1] - c_init.dataX) / xScale
     ];
   }
   
   if (context.touchDirections.y) {
-    for (var i = 0; i < 1  /*g.axes_.length*/; i++) {
+    for (i = 0; i < 1  /*g.axes_.length*/; i++) {
       var axis = g.axes_[i];
       if (axis.logscale) {
         // TODO(danvk): implement
       } else {
         axis.valueWindow = [
           c_init.dataY - swipe.dataY + (context.initialRange.y[0] - c_init.dataY) / yScale,
-          c_init.dataY - swipe.dataY + (context.initialRange.y[1] - c_init.dataY) / yScale,
+          c_init.dataY - swipe.dataY + (context.initialRange.y[1] - c_init.dataY) / yScale
         ];
       }
     }
@@ -481,7 +485,7 @@ Dygraph.Interaction.moveTouch = function(event, g, context) {
  * @private
  */
 Dygraph.Interaction.endTouch = function(event, g, context) {
-  if (event.touches.length != 0) {
+  if (event.touches.length !== 0) {
     // this is effectively a "reset"
     Dygraph.Interaction.startTouch(event, g, context);
   }
@@ -499,6 +503,9 @@ Dygraph.Interaction.endTouch = function(event, g, context) {
 Dygraph.Interaction.defaultModel = {
   // Track the beginning of drag events
   mousedown: function(event, g, context) {
+    // Right-click should not initiate a zoom.
+    if (event.button && event.button == 2) return;
+
     context.initializeMouseDown(event, g, context);
 
     if (event.altKey || event.shiftKey) {
@@ -545,6 +552,10 @@ Dygraph.Interaction.defaultModel = {
 
   // Disable zooming out if panning.
   dblclick: function(event, g, context) {
+    if (context.cancelNextDblclick) {
+      context.cancelNextDblclick = false;
+      return;
+    }
     if (event.altKey || event.shiftKey) {
       return;
     }