From e75debbf810c2ae18609ef9a86edbc3be30cf0c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel.odegaard@gmail.com>
Date: Sat, 9 Aug 2014 12:18:21 +0200
Subject: [PATCH] Fixes to text panel, and alert related to angularjs upgrade

---
 src/app/panels/text/module.js | 10 ++++++----
 src/app/services/alertSrv.js  |  6 +++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/app/panels/text/module.js b/src/app/panels/text/module.js
index 339a9a34e1f..26430e85020 100644
--- a/src/app/panels/text/module.js
+++ b/src/app/panels/text/module.js
@@ -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();
       }
     };
 
diff --git a/src/app/services/alertSrv.js b/src/app/services/alertSrv.js
index 9ea1a2581ce..781539bf1cc 100644
--- a/src/app/services/alertSrv.js
+++ b/src/app/services/alertSrv.js
@@ -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 = [];
     };
   });
-});
\ No newline at end of file
+});