IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-13 00:55:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12518 from grafana/12506_dash_links

Browse Source 
Fix links not updating after changing variables
This commit is contained in:
Marcus Efraimsson 2018-07-06 12:33:19 +02:00 committed by GitHub
commit 926892749f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
public/app/features/dashlinks/module.ts
View File

@ -41,20 +41,20 @@ function dashLink($compile, $sanitize, linkSrv) {
elem.html(template); elem.html(template);
$compile(elem.contents())(scope); $compile(elem.contents())(scope);
var anchor = elem.find('a');
var icon = elem.find('i');
var span = elem.find('span');
function update() { function update() {
var linkInfo = linkSrv.getAnchorInfo(link); var linkInfo = linkSrv.getAnchorInfo(link);
const anchor = elem.find('a');
const span = elem.find('span');
span.text(linkInfo.title); span.text(linkInfo.title);
if (!link.asDropdown) { if (!link.asDropdown) {
anchor.attr('href', linkInfo.href); anchor.attr('href', linkInfo.href);
sanitizeAnchor(); sanitizeAnchor();
} }
elem.find('a').attr('data-placement', 'bottom'); anchor.attr('data-placement', 'bottom');
// tooltip // tooltip
elem.find('a').tooltip({ anchor.tooltip({
title: $sanitize(scope.link.tooltip), title: $sanitize(scope.link.tooltip),
html: true, html: true,
container: 'body', container: 'body',
@ -62,12 +62,13 @@ function dashLink($compile, $sanitize, linkSrv) {
} }
function sanitizeAnchor() { function sanitizeAnchor() {
const anchor = elem.find('a');
const anchorSanitized = $sanitize(anchor.parent().html()); const anchorSanitized = $sanitize(anchor.parent().html());
anchor.parent().html(anchorSanitized); anchor.parent().html(anchorSanitized);
} }
icon.attr('class', 'fa fa-fw ' + scope.link.icon); elem.find('i').attr('class', 'fa fa-fw ' + scope.link.icon);
anchor.attr('target', scope.link.target); elem.find('a').attr('target', scope.link.target);
// fix for menus on the far right // fix for menus on the far right
if (link.asDropdown && scope.$last) { if (link.asDropdown && scope.$last) {