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

Fixes to text panel, and alert related to angularjs upgrade

Browse Source
This commit is contained in:
Torkel Ödegaard 2014-08-09 12:18:21 +02:00
parent 5b475a05ef
commit e75debbf81
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/panels/text/module.js
View File

@ -82,11 +82,13 @@ function (angular, app, _, require) {
$scope.updateContent = function(html) {
try {
$scope.content = $sce.trustAsHtml(filterSrv.applyTemplateToTarget(html));
if(!$scope.$$phase) {
$scope.$apply();
}
} catch(e) {
console.log('Text panel error: ', e);
$scope.content = $sce.trustAsHtml(html);
}
if(!$scope.$$phase) {
$scope.$apply();
}
};

6
src/app/services/alertSrv.js
View File

@ -7,7 +7,7 @@ function (angular, _) {
var module = angular.module('grafana.services');
module.service('alertSrv', function($timeout) {
module.service('alertSrv', function($timeout, $sce) {
var self = this;
// List of all alert objects
@ -17,7 +17,7 @@ function (angular, _) {
var
_a = {
title: title || '',
text: text || '',
text: $sce.trustAsHtml(text || ''),
severity: severity || 'info',
},
_ca = angular.toJson(_a),
@ -46,4 +46,4 @@ function (angular, _) {
self.list = [];
};
});
});
});