diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-01-12 14:42:12 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-01-12 14:42:12 +0000 |
| commit | d312f684b4df8901c5ea981f8e32b4612636cdfa (patch) | |
| tree | 1c9f577ff938a9190c4710b54eeb83ceea5acafb /app | |
| parent | 140935fbfd68bcf883d3f232e278b90896ee8d84 (diff) | |
| parent | bb2095ab0e9f23620368ba544de398d0e1313144 (diff) | |
| download | gitlab-ce-d312f684b4df8901c5ea981f8e32b4612636cdfa.tar.gz | |
Merge branch 'projects-dropdown-perf' into 'master'
Fixed performance of projects dropdown
Closes #41939
See merge request gitlab-org/gitlab-ce!16425
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/projects_dropdown/index.js | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/app/assets/javascripts/projects_dropdown/index.js b/app/assets/javascripts/projects_dropdown/index.js index 2660da3c558..e78ebce2923 100644 --- a/app/assets/javascripts/projects_dropdown/index.js +++ b/app/assets/javascripts/projects_dropdown/index.js @@ -19,11 +19,8 @@ document.addEventListener('DOMContentLoaded', () => { return; } - $(navEl).on('show.bs.dropdown', (e) => { - const dropdownEl = $(e.currentTarget).find('.projects-dropdown-menu'); - dropdownEl.one('transitionend', () => { - eventHub.$emit('dropdownOpen'); - }); + $(navEl).on('shown.bs.dropdown', () => { + eventHub.$emit('dropdownOpen'); }); // eslint-disable-next-line no-new |