mirror of
https://github.com/nasa/openmct.git
synced 2025-01-02 19:36:41 +00:00
WTD-842: Fixing mouse click in a plot area gets interpreted as a marquee zoom with an extent of zero.
This commit is contained in:
parent
ee04814f59
commit
1e6142ad45
platform/features/plot
@ -151,11 +151,14 @@ define(
|
|||||||
Math.max(a[1], b[1]) - origin[1]
|
Math.max(a[1], b[1]) - origin[1]
|
||||||
];
|
];
|
||||||
|
|
||||||
// Push the new state onto the pan-zoom stack
|
// Proceed with zoom if zoom dimensions are non zeros
|
||||||
panZoomStack.pushPanZoom(origin, dimensions);
|
if (!(dimensions[0] === 0 && dimensions[1] === 0)) {
|
||||||
|
// Push the new state onto the pan-zoom stack
|
||||||
|
panZoomStack.pushPanZoom(origin, dimensions);
|
||||||
|
|
||||||
// Make sure tick marks reflect new bounds
|
// Make sure tick marks reflect new bounds
|
||||||
updateTicks();
|
updateTicks();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Start with the right initial drawing bounds,
|
// Start with the right initial drawing bounds,
|
||||||
|
@ -136,6 +136,30 @@ define(
|
|||||||
);
|
);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it("disallows marquee zoom when start and end Marquee is at the same position", function () {
|
||||||
|
expect(mockPanZoomStack.pushPanZoom).not.toHaveBeenCalled();
|
||||||
|
|
||||||
|
// Simulate a marquee zoom. Note that the mockElement
|
||||||
|
// is 100 by 100 and starts at 10,20
|
||||||
|
subplot.startMarquee({
|
||||||
|
target: mockElement,
|
||||||
|
clientX: 60,
|
||||||
|
clientY: 45
|
||||||
|
});
|
||||||
|
subplot.hover({
|
||||||
|
target: mockElement,
|
||||||
|
clientX: 75,
|
||||||
|
clientY: 85
|
||||||
|
});
|
||||||
|
subplot.endMarquee({
|
||||||
|
target: mockElement,
|
||||||
|
clientX: 60,
|
||||||
|
clientY: 45
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(mockPanZoomStack.pushPanZoom).not.toHaveBeenCalled();
|
||||||
|
});
|
||||||
|
|
||||||
it("provides access to a drawable object", function () {
|
it("provides access to a drawable object", function () {
|
||||||
expect(typeof subplot.getDrawingObject()).toEqual('object');
|
expect(typeof subplot.getDrawingObject()).toEqual('object');
|
||||||
});
|
});
|
||||||
|
Loading…
Reference in New Issue
Block a user