diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
tree | c8f718a08e110ad7e1894510980d2155a6549197 /app/assets/javascripts/main.js | |
parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'app/assets/javascripts/main.js')
-rw-r--r-- | app/assets/javascripts/main.js | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/app/assets/javascripts/main.js b/app/assets/javascripts/main.js index d60f949c49d..b404f390a2d 100644 --- a/app/assets/javascripts/main.js +++ b/app/assets/javascripts/main.js @@ -40,6 +40,7 @@ import { initUserTracking, initDefaultTrackers } from './tracking'; import { __ } from './locale'; import * as tooltips from '~/tooltips'; +import * as popovers from '~/popovers'; import 'ee_else_ce/main_ee'; @@ -81,7 +82,7 @@ document.addEventListener('beforeunload', () => { // Close any open tooltips tooltips.dispose(document.querySelectorAll('.has-tooltip, [data-toggle="tooltip"]')); // Close any open popover - $('[data-toggle="popover"]').popover('dispose'); + popovers.dispose(); }); window.addEventListener('hashchange', handleLocationHash); @@ -166,13 +167,7 @@ function deferredInitialisation() { }); // Initialize popovers - $body.popover({ - selector: '[data-toggle="popover"]', - trigger: 'focus', - // set the viewport to the main content, excluding the navigation bar, so - // the navigation can't overlap the popover - viewport: '.layout-page', - }); + popovers.initPopovers(); // Adding a helper class to activate animations only after all is rendered setTimeout(() => $body.addClass('page-initialised'), 1000); |