mirror of
https://github.com/nasa/openmct.git
synced 2025-05-08 03:28:33 +00:00
Merge pull request #721 from nasa/open716
[Info Bubble] Fix bug with arrow positioning
This commit is contained in:
commit
d39dea971f
@ -85,7 +85,6 @@ define(
|
||||
popup.goesUp() ? 'arw-btm' : 'arw-top',
|
||||
popup.goesLeft() ? 'arw-right' : 'arw-left'
|
||||
].join(' ');
|
||||
scope.bubbleLayout = 'arw-top arw-left';
|
||||
|
||||
// Create the info bubble, now that we know how to
|
||||
// point the arrow...
|
||||
|
@ -109,6 +109,35 @@ define(
|
||||
);
|
||||
});
|
||||
|
||||
[ false, true ].forEach(function (goesLeft) {
|
||||
[ false, true].forEach(function (goesUp) {
|
||||
var vertical = goesUp ? "up" : "down",
|
||||
horizontal = goesLeft ? "left" : "right",
|
||||
location = [ vertical, horizontal].join('-');
|
||||
describe("when bubble goes " + location, function () {
|
||||
var expectedLocation = [
|
||||
goesUp ? "bottom" : "top",
|
||||
goesLeft ? "right" : "left"
|
||||
].join('-');
|
||||
|
||||
beforeEach(function () {
|
||||
mockPopup.goesUp.andReturn(goesUp);
|
||||
mockPopup.goesDown.andReturn(!goesUp);
|
||||
mockPopup.goesLeft.andReturn(goesLeft);
|
||||
mockPopup.goesRight.andReturn(!goesLeft);
|
||||
service.display('', '', {}, [ 10, 10 ]);
|
||||
});
|
||||
|
||||
it("positions the arrow in the " + expectedLocation, function () {
|
||||
expect(mockScope.bubbleLayout).toEqual([
|
||||
goesUp ? "arw-btm" : "arw-top",
|
||||
goesLeft ? "arw-right" : "arw-left"
|
||||
].join(' '));
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
});
|
||||
}
|
||||
);
|
||||
|
Loading…
x
Reference in New Issue
Block a user