diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-01-12 14:42:12 +0000 |
|---|---|---|
| committer | Robert Speicher <rspeicher@gmail.com> | 2018-01-15 13:29:44 -0600 |
| commit | 175052faa2daec94f83cb90bb79e7731a6c437dd (patch) | |
| tree | e401831293d39a9fc71311e8c89bcf3c77296779 | |
| parent | a718f3e70211ddfe17193d4430b85629ba69fcc6 (diff) | |
| download | gitlab-ce-175052faa2daec94f83cb90bb79e7731a6c437dd.tar.gz | |
Merge branch 'projects-dropdown-perf' into 'master'
Fixed performance of projects dropdown
Closes #41939
See merge request gitlab-org/gitlab-ce!16425
| -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 |