diff options
author | Luke Bennett <lukeeeebennettplus@gmail.com> | 2018-03-27 18:17:36 +0100 |
---|---|---|
committer | Luke Bennett <lukeeeebennettplus@gmail.com> | 2018-03-27 18:17:36 +0100 |
commit | 4950f3a5eef331f33df8fafd7ada5de5505a43e5 (patch) | |
tree | 58a527de73b87653b0c641ec0a01b6feccc8aafe /app/assets/javascripts/milestone.js | |
parent | 77ee14280e48987274ea9e6ce7ed8181de7f37a3 (diff) | |
download | gitlab-ce-4950f3a5eef331f33df8fafd7ada5de5505a43e5.tar.gz |
Review changes
Diffstat (limited to 'app/assets/javascripts/milestone.js')
-rw-r--r-- | app/assets/javascripts/milestone.js | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/app/assets/javascripts/milestone.js b/app/assets/javascripts/milestone.js index 5a7843f3093..714b543db04 100644 --- a/app/assets/javascripts/milestone.js +++ b/app/assets/javascripts/milestone.js @@ -1,7 +1,7 @@ import $ from 'jquery'; import axios from './lib/utils/axios_utils'; import flash from './flash'; -import { mouseenter, debouncedMouseleave } from './shared/popover'; +import { mouseenter, debouncedMouseleave, togglePopover } from './shared/popover'; export default class Milestone { constructor() { @@ -52,15 +52,21 @@ export default class Milestone { if (!deprecationMesssageContainer) return; const deprecationMessage = deprecationMesssageContainer.querySelector('.milestone-deprecation-message-template').innerHTML; - const popoverLink = deprecationMesssageContainer.querySelector('.popover-link'); + const $popover = $('.popover-link', deprecationMesssageContainer); + const hideOnScroll = togglePopover.bind($popover, false); - $(popoverLink).popover({ + $popover.popover({ content: deprecationMessage, html: true, placement: 'bottom', - trigger: 'manual', }) .on('mouseenter', mouseenter) - .on('mouseleave', debouncedMouseleave()); + .on('mouseleave', debouncedMouseleave()) + .on('show.bs.popover', () => { + window.addEventListener('scroll', hideOnScroll); + }) + .on('hide.bs.popover', () => { + window.removeEventListener('scroll', hideOnScroll); + }); } } |