summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
c65f230)
bug: consistent rules for defining when zoom is horizontal or vertical.
var dragStartY = null;
var dragEndX = null;
var dragEndY = null;
var dragStartY = null;
var dragEndX = null;
var dragEndY = null;
+ var dragDirection = null;
var prevEndX = null;
var prevEndY = null;
var prevDragDirection = null;
var prevEndX = null;
var prevEndY = null;
var prevDragDirection = null;
var yDelta = Math.abs(dragStartY - dragEndY);
// drag direction threshold for y axis is twice as large as x axis
var yDelta = Math.abs(dragStartY - dragEndY);
// drag direction threshold for y axis is twice as large as x axis
- var dragDirection = (xDelta < yDelta / 2) ? Dygraph.VERTICAL : Dygraph.HORIZONTAL;
+ dragDirection = (xDelta < yDelta / 2) ? Dygraph.VERTICAL : Dygraph.HORIZONTAL;
self.drawZoomRect_(dragDirection, dragStartX, dragEndX, dragStartY, dragEndY,
prevDragDirection, prevEndX, prevEndY);
self.drawZoomRect_(dragDirection, dragStartX, dragEndX, dragStartY, dragEndY,
prevDragDirection, prevEndX, prevEndY);
- if (regionWidth >= 10 && regionWidth > regionHeight) {
+ if (regionWidth >= 10 && dragDirection == Dygraph.HORIZONTAL) {
self.doZoomX_(Math.min(dragStartX, dragEndX),
Math.max(dragStartX, dragEndX));
self.doZoomX_(Math.min(dragStartX, dragEndX),
Math.max(dragStartX, dragEndX));
- } else if (regionHeight >= 10 && regionHeight > regionWidth){
+ } else if (regionHeight >= 10 && dragDirection == Dygraph.VERTICAL){
self.doZoomY_(Math.min(dragStartY, dragEndY),
Math.max(dragStartY, dragEndY));
} else {
self.doZoomY_(Math.min(dragStartY, dragEndY),
Math.max(dragStartY, dragEndY));
} else {
function unzoomGraph() {
g.updateOptions({
function unzoomGraph() {
g.updateOptions({
- dateWindow: undefined,
- valueRange: undefined
+ dateWindow: null,
+ valueRange: null