diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2017-09-25 09:29:20 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2017-09-25 09:29:20 +0000 |
commit | 6c57d894688930de25521fa1e276c6c2990b6d7a (patch) | |
tree | 10d6e3394bd28d84135d890a70c541fee1303b6a | |
parent | 4d88f6496836c7fbf8a0f58e4d2604bf2c3f96d5 (diff) | |
parent | 35d189d6a781b55f190b9637c133d2d5eda29ee9 (diff) | |
download | gitlab-ce-6c57d894688930de25521fa1e276c6c2990b6d7a.tar.gz |
Merge branch 'fly-out-nav-mousepos-error' into 'master'
Fixed fly-out error if mousePos array is empty
See merge request gitlab-org/gitlab-ce!14338
-rw-r--r-- | app/assets/javascripts/fly_out_nav.js | 2 | ||||
-rw-r--r-- | spec/javascripts/fly_out_nav_spec.js | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/app/assets/javascripts/fly_out_nav.js b/app/assets/javascripts/fly_out_nav.js index 157280d66e3..98837c3b2a0 100644 --- a/app/assets/javascripts/fly_out_nav.js +++ b/app/assets/javascripts/fly_out_nav.js @@ -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]; diff --git a/spec/javascripts/fly_out_nav_spec.js b/spec/javascripts/fly_out_nav_spec.js index f4b4d7980a4..4f20e31f511 100644 --- a/spec/javascripts/fly_out_nav_spec.js +++ b/spec/javascripts/fly_out_nav_spec.js @@ -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({ |