Commit 62df406d by Alexander Zobnin Committed by Torkel Ödegaard

fix info popover, #10302 (#10377)

parent e84b6d18
...@@ -10,10 +10,10 @@ export function infoPopover() { ...@@ -10,10 +10,10 @@ export function infoPopover() {
template: '<i class="fa fa-info-circle"></i>', template: '<i class="fa fa-info-circle"></i>',
transclude: true, transclude: true,
link: function(scope, elem, attrs, ctrl, transclude) { link: function(scope, elem, attrs, ctrl, transclude) {
var offset = attrs.offset || '0 -10px'; let offset = attrs.offset || '0 -10px';
var position = attrs.position || 'right middle'; let position = attrs.position || 'right middle';
var classes = 'drop-help drop-hide-out-of-bounds'; let classes = 'drop-help drop-hide-out-of-bounds';
var openOn = 'hover'; let openOn = 'hover';
elem.addClass('gf-form-help-icon'); elem.addClass('gf-form-help-icon');
...@@ -26,14 +26,14 @@ export function infoPopover() { ...@@ -26,14 +26,14 @@ export function infoPopover() {
} }
transclude(function(clone, newScope) { transclude(function(clone, newScope) {
var content = document.createElement('div'); let content = document.createElement('div');
content.className = 'markdown-html'; content.className = 'markdown-html';
_.each(clone, node => { _.each(clone, node => {
content.appendChild(node); content.appendChild(node);
}); });
var drop = new Drop({ let dropOptions = {
target: elem[0], target: elem[0],
content: content, content: content,
position: position, position: position,
...@@ -50,13 +50,18 @@ export function infoPopover() { ...@@ -50,13 +50,18 @@ export function infoPopover() {
}, },
], ],
}, },
}); };
var unbind = scope.$on('$destroy', function() { // Create drop in next digest after directive content is rendered.
scope.$applyAsync(() => {
let drop = new Drop(dropOptions);
let unbind = scope.$on('$destroy', function() {
drop.destroy(); drop.destroy();
unbind(); unbind();
}); });
}); });
});
}, },
}; };
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment