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

Merge branch 'master' of github.com:Akeru/grafana into Akeru-master

Browse Source
This commit is contained in:
Torkel Ödegaard
2014-06-30 08:05:48 +02:00
parent 505f0f65d0 c100054d68
commit 2ac7b9dabf
2 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/app/panels/text/module.html
View File

@@ -1,10 +1,9 @@
<div ng-controller='text' ng-init="init()" style="min-height:{{panel.height || row.height}}" ng-dblclick="openEditor()">
<!--<p ng-style="panel.style" ng-bind-html-unsafe="panel.content | striphtml | newlines"></p>-->
<markdown ng-show="ready && panel.mode == 'markdown'">
{{panel.content}}
<markdown ng-show="ready && panel.mode == 'markdown'" ng-bind-html-unsafe="panel.content | applymarkdown | applytemplate">
</markdown>
<p ng-show="panel.mode == 'text'" ng-style='panel.style' ng-bind-html-unsafe="panel.content | striphtml | newlines">
<p ng-show="panel.mode == 'text'" ng-style='panel.style' ng-bind-html-unsafe="panel.content | striphtml | newlines | applytemplate">
</p>
<p ng-show="panel.mode == 'html'" ng-bind-html-unsafe="panel.content">
<p ng-show="panel.mode == 'html'" ng-bind-html-unsafe="panel.content | applytemplate">
</p>
</div>

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

@@ -14,7 +14,8 @@ define([
'angular',
'app',
'underscore',
'require'
'require',
'services/filterSrv'
],
function (angular, app, _, require) {
'use strict';
@@ -98,4 +99,25 @@ function (angular, app, _, require) {
.replace(/</g, '&lt;');
};
});
});
module.filter('applytemplate', function(filterSrv) {
return function (input) {
return filterSrv.applyTemplateToTarget(input);
};
});
module.filter('applymarkdown', function() {
return function (input) {
if(require.defined('./lib/showdown')) {
var Showdown = require('./lib/showdown');
var converter = new Showdown.converter();
var text = input.replace(/&/g, '&amp;')
.replace(/>/g, '&gt;')
.replace(/</g, '&lt;');
return converter.makeHtml(text);
} else {
return input;
}
};
});
});