ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-20 13:43:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

WTD-842: Fixing mouse click in a plot area gets interpreted as a marquee zoom with an extent of zero.

Browse Source
This commit is contained in:
bwyu 2015-03-12 14:50:44 -07:00 committed by Victor Woeltjen
parent ee04814f59
commit 1e6142ad45
2 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
platform/features/plot/src/SubPlot.js
View File

@ -151,11 +151,14 @@ define(
Math.max(a[1], b[1]) - origin[1]
];
// Push the new state onto the pan-zoom stack
panZoomStack.pushPanZoom(origin, dimensions);
// Proceed with zoom if zoom dimensions are non zeros
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
updateTicks();
// Make sure tick marks reflect new bounds
updateTicks();
}
}
// Start with the right initial drawing bounds,

24
platform/features/plot/test/SubPlotSpec.js
View File

@ -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 () {
expect(typeof subplot.getDrawingObject()).toEqual('object');
});