projects
/
dygraphs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into kberg-work
[dygraphs.git]
/
dygraph-interaction-model.js
diff --git
a/dygraph-interaction-model.js
b/dygraph-interaction-model.js
index
8270c82
..
53e2f44
100644
(file)
--- a/
dygraph-interaction-model.js
+++ b/
dygraph-interaction-model.js
@@
-19,7
+19,7
@@
* be considered a zoom. This makes it easier to zoom to the exact edge of the
* chart, a fairly common operation.
*/
* be considered a zoom. This makes it easier to zoom to the exact edge of the
* chart, a fairly common operation.
*/
-var DRAG_EDGE_MARGIN =
2
00;
+var DRAG_EDGE_MARGIN =
1
00;
/**
* A collection of functions to facilitate build custom interaction models.
/**
* A collection of functions to facilitate build custom interaction models.
@@
-49,7
+49,7
@@
Dygraph.Interaction.maybeTreatMouseOpAsClick = function(event, g, context) {
context.regionWidth = regionWidth;
context.regionHeight = regionHeight;
context.regionWidth = regionWidth;
context.regionHeight = regionHeight;
-}
+}
;
/**
* Called in response to an interaction model operation that
/**
* Called in response to an interaction model operation that
@@
-371,6
+371,7
@@
Dygraph.Interaction.treatMouseOpAsClick = function(g, event, context) {
* context.
*/
Dygraph.Interaction.endZoom = function(event, g, context) {
* context.
*/
Dygraph.Interaction.endZoom = function(event, g, context) {
+ g.clearZoomRect_();
context.isZooming = false;
Dygraph.Interaction.maybeTreatMouseOpAsClick(event, g, context);
context.isZooming = false;
Dygraph.Interaction.maybeTreatMouseOpAsClick(event, g, context);
@@
-398,8
+399,6
@@
Dygraph.Interaction.endZoom = function(event, g, context) {
g.doZoomY_(top, bottom);
}
context.cancelNextDblclick = true;
g.doZoomY_(top, bottom);
}
context.cancelNextDblclick = true;
- } else {
- if (context.zoomMoved) g.clearZoomRect_();
}
context.dragStartX = null;
context.dragStartY = null;
}
context.dragStartX = null;
context.dragStartY = null;