Merge branch 'projects-dropdown-perf' into 'master'

Fixed performance of projects dropdown Closes #41939 See merge request gitlab-org/gitlab-ce!16425

Merge branch 'projects-dropdown-perf' into 'master'
175052fa · Filipa Lacerda · Robert Speicher · a718f3e7 · 175052fa
Commit 175052fa authored Jan 12, 2018 by Filipa Lacerda Committed by Robert Speicher Jan 15, 2018
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

index.js app/assets/javascripts/projects_dropdown/index.js +1 -4

No files found.
--- a/app/assets/javascripts/projects_dropdown/index.js
+++ b/app/assets/javascripts/projects_dropdown/index.js
@@ -19,12 +19,9 @@ document.addEventListener('DOMContentLoaded', () => {
    return;
  }

-  $(navEl).on('show.bs.dropdown', (e) => {
-    const dropdownEl = $(e.currentTarget).find('.projects-dropdown-menu');
-    dropdownEl.one('transitionend', () => {
+  $(navEl).on('shown.bs.dropdown', () => {
    eventHub.$emit('dropdownOpen');
  });
-  });

  // eslint-disable-next-line no-new
  new Vue({