summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Bennett <lukeeeebennettplus@gmail.com>2018-03-21 18:23:42 +0000
committerLuke Bennett <lukeeeebennettplus@gmail.com>2018-03-21 18:23:42 +0000
commit5595afe807c3c11d9c695c558da1210a25544387 (patch)
tree3e3400f64b60a164b5b59069674417aa3bd13b87
parent0488d44cc2cc55808cf5aa17cb1b0c5423c958db (diff)
downloadgitlab-ce-5595afe807c3c11d9c695c558da1210a25544387.tar.gz
Impl popover for milestone deprecation
-rw-r--r--app/assets/javascripts/milestone.js28
1 files changed, 4 insertions, 24 deletions
diff --git a/app/assets/javascripts/milestone.js b/app/assets/javascripts/milestone.js
index ab97fa50fd5..0f1dcc7e9e9 100644
--- a/app/assets/javascripts/milestone.js
+++ b/app/assets/javascripts/milestone.js
@@ -1,5 +1,6 @@
import axios from './lib/utils/axios_utils';
import flash from './flash';
+import Popover from './shared/popover';
export default class Milestone {
constructor() {
@@ -49,31 +50,10 @@ export default class Milestone {
if (!deprecationMesssage) return;
- const deprecationMesssageTemplate = deprecationMesssage.querySelector('.milestone-deprecation-message-template');
+ const deprecationMesssageTemplate = deprecationMesssage.querySelector('.milestone-deprecation-message-template').innerHTML;
const popoverLink = deprecationMesssage.querySelector('.popover-link');
- const $popoverLink = $(popoverLink);
- $popoverLink
- .popover({
- html: true,
- placement: 'bottom',
- content: deprecationMesssageTemplate.innerHTML,
- trigger: 'hover',
- })
- .on('inserted.bs.popover', () => {
- const $popover = $popoverLink.siblings('.popover').first();
- const $popoverContent = $('.popover-content', $popover);
-
- $popoverContent.on('mouseleave', () => {
- $popoverContent.off('mouseleave');
- $popoverLink.popover('hide');
- });
- })
- .on('hidden.bs.popover', (event) => {
- $(event.target).data('bs.popover').inState.click = false;
- })
- .on('mouseleave', () => {
-
- });
+ const popover = new Popover(popoverLink, deprecationMesssageTemplate);
+ popover.init();
}
}