Add latest changes from gitlab-org/gitlab@master

1 files changed, 21 insertions, 4 deletions

diff --git a/app/assets/javascripts/contextual_sidebar.js b/app/assets/javascripts/contextual_sidebar.js
index d1a68e80608..f2ff77daf02 100644
--- a/app/assets/javascripts/contextual_sidebar.js
+++ b/app/assets/javascripts/contextual_sidebar.js
@@ -2,8 +2,6 @@ import { GlBreakpointInstance as bp, breakpoints } from '@gitlab/ui/dist/utils';
 import $ from 'jquery';
 import { debounce } from 'lodash';
 import { getCookie, setCookie, parseBoolean } from '~/lib/utils/common_utils';
-import initInviteMembersModal from '~/invite_members/init_invite_members_modal';
-import initInviteMembersTrigger from '~/invite_members/init_invite_members_trigger';
 
 export const SIDEBAR_COLLAPSED_CLASS = 'js-sidebar-collapsed';
 
@@ -114,7 +112,26 @@ export default class ContextualSidebar {
       this.toggleCollapsedSidebar(collapse, true);
     }
 
-    initInviteMembersModal();
-    initInviteMembersTrigger();
+    const modalEl = document.querySelector('.js-invite-members-modal');
+    if (modalEl) {
+      import(
+        /* webpackChunkName: 'initInviteMembersModal' */ '~/invite_members/init_invite_members_modal'
+      )
+        .then(({ default: initInviteMembersModal }) => {
+          initInviteMembersModal();
+        })
+        .catch(() => {});
+
+      const inviteTriggers = document.querySelectorAll('.js-invite-members-trigger');
+      if (inviteTriggers) {
+        import(
+          /* webpackChunkName: 'initInviteMembersTrigger' */ '~/invite_members/init_invite_members_trigger'
+        )
+          .then(({ default: initInviteMembersTrigger }) => {
+            initInviteMembersTrigger();
+          })
+          .catch(() => {});
+      }
+    }
   }
 }