kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch 'fly-out-nav-mousepos-error' into 'master'

Browse source 
Fixed fly-out error if mousePos array is empty

See merge request gitlab-org/gitlab-ce!14338
This commit is contained in:
Filipa Lacerda 2017-09-25 09:29:20 +00:00
commit 6c57d89468
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/fly_out_nav.js
View file

@ -34,7 +34,7 @@ export const canShowActiveSubItems = (el) => {
export const canShowSubItems = () => bp.getBreakpointSize() === 'sm' || bp.getBreakpointSize() === 'md' || bp.getBreakpointSize() === 'lg';
export const getHideSubItemsInterval = () => {
if (!currentOpenMenu) return 0;
if (!currentOpenMenu || !mousePos.length) return 0;
const currentMousePos = mousePos[mousePos.length - 1];
const prevMousePos = mousePos[0];

6
spec/javascripts/fly_out_nav_spec.js
View file

@ -73,6 +73,12 @@ describe('Fly out sidebar navigation', () => {
).toBe(0);
});
it('returns 0 if mousePos is empty', () => {
expect(
getHideSubItemsInterval(),
).toBe(0);
});
it('returns 0 when mouse above sub-items', () => {
showSubLevelItems(el);
documentMouseMove({